diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index ba110231f..5f273ae43 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -8,7 +8,6 @@ import mekanism.common.base.TileNetworkList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -226,7 +225,7 @@ public class Coord4D { IBlockState state = getBlockState(world); - if(state == null || state == Blocks.AIR) + if(state == null || state.getBlock().isAir(state, world, null)) { return ItemStack.EMPTY; } diff --git a/src/main/java/mekanism/api/IMekWrench.java b/src/main/java/mekanism/api/IMekWrench.java index 2214535b6..843610c4a 100644 --- a/src/main/java/mekanism/api/IMekWrench.java +++ b/src/main/java/mekanism/api/IMekWrench.java @@ -13,7 +13,7 @@ public interface IMekWrench /* easier compat with BC */ default boolean canUseWrench(EntityPlayer player, EnumHand hand, ItemStack stack, RayTraceResult rayTrace) { - return canUseWrench(stack, player, rayTrace.getBlockPos() != null ? rayTrace.getBlockPos() : BlockPos.ORIGIN); + return canUseWrench(stack, player, rayTrace.getBlockPos()); } default void wrenchUsed(EntityPlayer player, EnumHand hand, ItemStack wrench, RayTraceResult rayTrace){} diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java index daee21238..14f923d11 100644 --- a/src/main/java/mekanism/api/Pos3D.java +++ b/src/main/java/mekanism/api/Pos3D.java @@ -11,6 +11,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; +import javax.annotation.Nonnull; + /** * Pos3D - a way of performing operations on objects in a three dimensional environment. * @author aidancbrady @@ -189,6 +191,8 @@ public class Pos3D extends Vec3d * @param yaw - yaw to rotate by * @return rotated Pos3D */ + @Nonnull + @Override public Pos3D rotateYaw(float yaw) { double yawRadians = Math.toRadians(yaw); @@ -204,7 +208,8 @@ public class Pos3D extends Vec3d return new Pos3D(xPos, y, zPos); } - + + @Nonnull @Override public Pos3D rotatePitch(float pitch) { @@ -257,6 +262,7 @@ public class Pos3D extends Vec3d return new Pos3D(this.x * x, this.y * y, this.z * z); } + @Nonnull @Override public Pos3D scale(double scale) { @@ -321,6 +327,7 @@ public class Pos3D extends Vec3d return Math.acos(pos1.clone().dotProduct(pos2)); } + @Nonnull @Override public Pos3D normalize() { @@ -370,6 +377,7 @@ public class Pos3D extends Vec3d return new Pos3D(x, y, z); } + @Nonnull @Override public String toString() { diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java index d0345f3a2..61182d0fb 100644 --- a/src/main/java/mekanism/api/gas/GasRegistry.java +++ b/src/main/java/mekanism/api/gas/GasRegistry.java @@ -4,9 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import com.google.common.base.Preconditions; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java index 17649a918..b91055347 100644 --- a/src/main/java/mekanism/api/gas/IGasHandler.java +++ b/src/main/java/mekanism/api/gas/IGasHandler.java @@ -41,7 +41,7 @@ public interface IGasHandler */ boolean canDrawGas(EnumFacing side, Gas type); - static GasTankInfo[] NONE = new GasTankInfo[0]; + GasTankInfo[] NONE = new GasTankInfo[0]; /** * Gets the tanks present on this handler. READ ONLY. DO NOT MODIFY. diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 9273a6941..29f4cbffb 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -360,7 +360,7 @@ public abstract class DynamicNetwork> implemen i.remove(); } } - } catch(Exception e) {} + } catch(Exception ignored) {} if(updateDelay > 0) { diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 0e77e68c1..445751cc5 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -124,7 +124,6 @@ import mekanism.common.block.states.BlockStatePlastic.PlasticBlockStateMapper; import mekanism.common.block.states.BlockStateTransmitter.TransmitterStateMapper; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.config.MekanismConfig.client; -import mekanism.common.config.MekanismConfig.general; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; @@ -659,7 +658,7 @@ public class ClientProxy extends CommonProxy return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); }); - + ItemMeshDefinition machineMesher = stack -> { MachineType type = MachineType.get(stack); @@ -1119,7 +1118,7 @@ public class ClientProxy extends CommonProxy { Minecraft.getMinecraft().addScheduledTask(runnable); } - else if(player != null && !player.world.isRemote) + else { ((WorldServer)player.world).addScheduledTask(runnable); //singleplayer } diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index a4cb88c7d..745ba8e74 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -47,7 +47,7 @@ public final class HolidayManager } } } - } catch(Exception e) {} + } catch(Exception ignored) {} } public static ResourceLocation filterSound(ResourceLocation sound) @@ -67,7 +67,7 @@ public final class HolidayManager return holiday.filterSound(sound); } } - } catch(Exception e) {} + } catch(Exception ignored) {} return sound; } diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 3296c64ab..f920501a1 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -20,7 +20,6 @@ import mekanism.common.network.PacketFreeRunnerData; import mekanism.common.network.PacketItemStack.ItemStackMessage; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; -import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.util.LangUtils; import mekanism.common.util.ListUtils; import mekanism.common.util.StackUtils; diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index 395157389..7af7ec771 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -41,7 +41,7 @@ public class SparkleAnimation } loop(pointer); - } catch(Exception e) {} + } catch(Exception ignored) {} try { new Thread(() -> @@ -61,7 +61,7 @@ public class SparkleAnimation } } }).start(); - } catch(Exception e) {} + } catch(Exception ignored) {} } public void loop(TileEntity tileEntity) diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java index 77e1a8037..b8d5edeae 100644 --- a/src/main/java/mekanism/client/ThreadClientUpdate.java +++ b/src/main/java/mekanism/client/ThreadClientUpdate.java @@ -172,7 +172,7 @@ public class ThreadClientUpdate extends Thread private void prepareForDownload() { - File[] modsList = new File(String.valueOf(Mekanism.proxy.getMinecraftDir()) + File.separator + "mods").listFiles(); + File[] modsList = new File(Mekanism.proxy.getMinecraftDir() + File.separator + "mods").listFiles(); if(Mekanism.versionNumber.comparedState(Version.get(Mekanism.latestVersionNumber)) == -1) { @@ -203,7 +203,7 @@ public class ThreadClientUpdate extends Thread { try { return new URL("http://ci.aidancbrady.com/job/Mekanism/Recommended/artifact/*zip*/archive.zip"); - } catch(Exception e) {} + } catch(Exception ignored) {} return null; } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 81b40bb6d..fd238aec3 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -121,7 +121,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 131, 14); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(Exception e) {} + } catch(Exception ignored) {} } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiCredits.java b/src/main/java/mekanism/client/gui/GuiCredits.java index 127997d3d..a3eb5952c 100644 --- a/src/main/java/mekanism/client/gui/GuiCredits.java +++ b/src/main/java/mekanism/client/gui/GuiCredits.java @@ -22,7 +22,7 @@ public class GuiCredits extends GuiScreen buttonList.clear(); buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 72 + 12, "Update")); buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 96 + 12, "Cancel")); - ((GuiButton)buttonList.get(0)).enabled = !MekanismUtils.noUpdates() && !ThreadClientUpdate.hasUpdated; + buttonList.get(0).enabled = !MekanismUtils.noUpdates() && !ThreadClientUpdate.hasUpdated; } public static void updateInfo(String info) diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 06e48a3ac..a217ba60e 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -25,7 +25,6 @@ import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; -import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 253bd57db..8847308e1 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -186,17 +186,11 @@ public class GuiDigitalMinerConfig extends GuiMekanism { if(filter instanceof MOreDictFilter && !oreDictFilters.contains(filter)) { - if(oreDictStacks.containsKey(filter)) - { - oreDictStacks.remove(filter); - } + oreDictStacks.remove(filter); } else if(filter instanceof MModIDFilter && !modIDFilters.contains(filter)) { - if(modIDStacks.containsKey(filter)) - { - modIDStacks.remove(filter); - } + modIDStacks.remove(filter); } } } @@ -489,7 +483,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(Exception e) {} + } catch(Exception ignored) {} } fontRenderer.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040); @@ -528,7 +522,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(Exception e) {} + } catch(Exception ignored) {} } fontRenderer.drawString(LangUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index fb7bbc882..917512d62 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -182,7 +182,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 26 && xAxis <= 42 && yAxis >= 75 && yAxis <= 91) { - drawTexturedModalRect(guiWidth + 26, guiHeight + 75, 176 + 62, 48 + 0, 16, 16); + drawTexturedModalRect(guiWidth + 26, guiHeight + 75, 176 + 62, 48, 16, 16); } else { drawTexturedModalRect(guiWidth + 26, guiHeight + 75, 176 + 62, 48 + 16, 16, 16); @@ -210,7 +210,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(!stack.isEmpty()) { - Slot slot = (Slot)inventorySlots.inventorySlots.get(i+20); + Slot slot = inventorySlots.inventorySlots.get(i+20); GlStateManager.pushMatrix(); if(slot.getStack().isEmpty() || !slot.getStack().isItemEqual(stack)) diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index be32ffbec..ae3dda2df 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -205,17 +205,11 @@ public class GuiLogisticalSorter extends GuiMekanism { if(filter instanceof TOreDictFilter && !oreDictFilters.contains(filter)) { - if(oreDictStacks.containsKey(filter)) - { - oreDictStacks.remove(filter); - } + oreDictStacks.remove(filter); } else if(filter instanceof TModIDFilter && !modIDFilters.contains(filter)) { - if(modIDStacks.containsKey(filter)) - { - modIDStacks.remove(filter); - } + modIDStacks.remove(filter); } } } @@ -494,7 +488,7 @@ public class GuiLogisticalSorter extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(final Exception e) {} + } catch(final Exception ignored) {} } fontRenderer.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040); @@ -535,7 +529,7 @@ public class GuiLogisticalSorter extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(final Exception e) {} + } catch(final Exception ignored) {} } fontRenderer.drawString(LangUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 17f47ce17..faeb3695e 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -77,7 +77,7 @@ public class GuiMItemStackFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } } diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 872f85eda..fb615e6b0 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -77,7 +77,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } } diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 5185b41cc..59e47d39d 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -175,7 +175,7 @@ public class GuiMModIDFilter extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(Exception e) {} + } catch(Exception ignored) {} } if(!filter.replaceStack.isEmpty()) @@ -368,7 +368,7 @@ public class GuiMModIDFilter extends GuiMekanism { String modName = modIDText.getText(); - if(modName == null || modName.isEmpty()) + if(modName.isEmpty()) { status = EnumColor.DARK_RED + LangUtils.localize("gui.modIDFilter.noID"); return; diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index 00e2de02b..97e1727c5 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -93,7 +93,7 @@ public class GuiMOreDictFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } oreDictText = new GuiTextField(2, fontRenderer, guiWidth + 35, guiHeight + 47, 95, 12); @@ -175,7 +175,7 @@ public class GuiMOreDictFilter extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(Exception e) {} + } catch(Exception ignored) {} } if(!filter.replaceStack.isEmpty()) @@ -368,7 +368,7 @@ public class GuiMOreDictFilter extends GuiMekanism { String oreName = oreDictText.getText(); - if(oreName == null || oreName.isEmpty()) + if(oreName.isEmpty()) { status = EnumColor.DARK_RED + LangUtils.localize("gui.oredictFilter.noKey"); return; diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 89b714f77..fbbaec37a 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -80,7 +80,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper public static boolean isTextboxKey(char c, int i) { if(i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT || - i == Keyboard.KEY_END || i == Keyboard.KEY_HOME || i == Keyboard.KEY_BACK || isKeyComboCtrlA(i) || + i == Keyboard.KEY_END || i == Keyboard.KEY_HOME || isKeyComboCtrlA(i) || isKeyComboCtrlC(i) || isKeyComboCtrlV(i) || isKeyComboCtrlX(i)) { return true; @@ -108,7 +108,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper for(int i = 0; i < inventorySlots.inventorySlots.size(); i++) { - Slot slot = (Slot)inventorySlots.inventorySlots.get(i); + Slot slot = inventorySlots.inventorySlots.get(i); if(isMouseOverSlot(slot, mouseX, mouseY)) { diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index 387ea4595..0e64ae744 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -51,7 +51,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism tileEntity = tentity; origFilter = tileEntity.filters.get(index); - filter = ((OredictionificatorFilter)tentity.filters.get(index)).clone(); + filter = tentity.filters.get(index).clone(); updateRenderStack(); } @@ -94,18 +94,18 @@ public class GuiOredictionificatorFilter extends GuiMekanism { if(filter.filter != null && !filter.filter.isEmpty()) { - ((GuiButton)buttonList.get(0)).enabled = true; + buttonList.get(0).enabled = true; } else { - ((GuiButton)buttonList.get(0)).enabled = false; + buttonList.get(0).enabled = false; } if(!isNew) { - ((GuiButton)buttonList.get(1)).enabled = true; + buttonList.get(1).enabled = true; } else { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } } @@ -157,7 +157,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 45, 19); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(Exception e) {} + } catch(Exception ignored) {} } if(xAxis >= 31 && xAxis <= 43 && yAxis >= 21 && yAxis <= 33) diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 76f2d9536..c8bc160d4 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -47,7 +47,7 @@ public class GuiRobitMain extends GuiMekanism private void changeName() { - if(nameChangeField.getText() != null && !nameChangeField.getText().isEmpty()) + if(!nameChangeField.getText().isEmpty()) { Mekanism.packetHandler.sendToServer(new RobitMessage(RobitPacketType.NAME, robit.getEntityId(), 0, nameChangeField.getText())); toggleNameChange(); diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index dfdd57974..88e493dd2 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -31,6 +31,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import javax.annotation.Nonnull; + @SideOnly(Side.CLIENT) public class GuiRobitRepair extends GuiMekanism implements IContainerListener { @@ -254,13 +256,13 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener } @Override - public void sendAllContents(Container container, NonNullList list) + public void sendAllContents(@Nonnull Container container, @Nonnull NonNullList list) { sendSlotContents(container, 0, container.getSlot(0).getStack()); } @Override - public void sendSlotContents(Container container, int slotID, ItemStack itemstack) + public void sendSlotContents(@Nonnull Container container, int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -276,8 +278,8 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener } @Override - public void sendWindowProperty(Container par1Container, int par2, int par3) {} + public void sendWindowProperty(@Nonnull Container par1Container, int par2, int par3) {} @Override - public void sendAllWindowProperties(Container p_175173_1_, IInventory p_175173_2_) {} + public void sendAllWindowProperties(@Nonnull Container p_175173_1_, @Nonnull IInventory p_175173_2_) {} } diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index 783a876c0..4f066bc5d 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -232,13 +232,10 @@ public class GuiSecurityDesk extends GuiMekanism if(tileEntity.frequency != null && selection != -1) { - if(tileEntity != null) - { - TileNetworkList data = TileNetworkList.withContents(1, tileEntity.frequency.trusted.get(selection)); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - } - + TileNetworkList data = TileNetworkList.withContents(1, tileEntity.frequency.trusted.get(selection)); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + scrollList.selected = -1; } } @@ -252,7 +249,7 @@ public class GuiSecurityDesk extends GuiMekanism int xAxis = (mouseX-(width-xSize)/2); int yAxis = (mouseY-(height-ySize)/2); - String ownerText = EnumColor.RED + tileEntity.clientOwner != null ? (LangUtils.localize("gui.owner") + ": " + tileEntity.clientOwner) : LangUtils.localize("gui.noOwner"); + String ownerText = tileEntity.clientOwner != null ? (LangUtils.localize("gui.owner") + ": " + tileEntity.clientOwner) : EnumColor.RED + LangUtils.localize("gui.noOwner"); fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 4, 0x404040); fontRenderer.drawString(ownerText, (xSize - 7) - fontRenderer.getStringWidth(ownerText), (ySize - 96) + 2, 0x404040); fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index cc2db1d25..473b7ff0f 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -12,7 +12,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -40,7 +39,7 @@ public class GuiSeismicReader extends GuiScreen private Rectangle upButton, downButton, tooltip; - private int currentLayer = 0; + private int currentLayer; public GuiSeismicReader(World world, Coord4D coord, ItemStack stack) { @@ -113,12 +112,7 @@ public class GuiSeismicReader extends GuiScreen if(0 <= layer && layer < blockList.size()) { ItemStack stack = new ItemStack(blockList.get(layer).getRight(), 1, blockList.get(layer).getLeft()); - - if(stack.getItem() == null) - { - continue; - } - + GlStateManager.pushMatrix(); GlStateManager.translate(centralX - 2, centralY - i * 16 + (22 * 2), 0); @@ -144,17 +138,8 @@ public class GuiSeismicReader extends GuiScreen if(currentLayer - 1 >= 0) { ItemStack nameStack = new ItemStack(blockList.get(currentLayer - 1).getRight(), 1, blockList.get(currentLayer - 1).getLeft()); - String renderString = "unknown"; - - if(nameStack.getItem() != null) - { - renderString = nameStack.getDisplayName(); - } - else if(blockList.get(currentLayer - 1).getRight() == Blocks.AIR) - { - renderString = "Air"; - } - + String renderString = nameStack.getDisplayName(); + String capitalised = renderString.substring(0, 1).toUpperCase() + renderString.substring(1); int lengthX = fontRenderer.getStringWidth(capitalised); float renderScale = lengthX > 53 ? 53f / lengthX : 1.0f; diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index be0de933c..e333338a9 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -82,7 +82,7 @@ public class GuiTItemStackFilter extends GuiMekanism if(isNew) { - ((GuiButton)buttonList.get(1)).enabled = false; + buttonList.get(1).enabled = false; } minField = new GuiTextField(2, fontRenderer, guiWidth + 149, guiHeight + 19, 20, 11); @@ -106,7 +106,7 @@ public class GuiTItemStackFilter extends GuiMekanism int min = Integer.parseInt(minField.getText()); int max = Integer.parseInt(maxField.getText()); - if(max >= min && max <= 64 && min <= 64) + if(max >= min && max <= 64) { filter.min = Integer.parseInt(minField.getText()); filter.max = Integer.parseInt(maxField.getText()); @@ -126,7 +126,7 @@ public class GuiTItemStackFilter extends GuiMekanism status = EnumColor.DARK_RED + "Max 64 || min > 64) + else //if(max > 64 || min > 64) { status = EnumColor.DARK_RED + "Max>64"; ticker = 20; diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index e1e15fc73..3cd9b5e5a 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -104,7 +104,7 @@ public class GuiTMaterialFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } - else if(filter.materialItem.isEmpty()) + else { status = EnumColor.DARK_RED + LangUtils.localize("gui.itemFilter.noItem"); ticker = 20; diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 5bd1ac22e..0a9fbbac4 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -177,7 +177,7 @@ public class GuiTModIDFilter extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(Exception e) {} + } catch(Exception ignored) {} } if(filter.color != null) @@ -362,7 +362,7 @@ public class GuiTModIDFilter extends GuiMekanism { String modName = modIDText.getText(); - if(modName == null || modName.isEmpty()) + if(modName.isEmpty()) { status = EnumColor.DARK_RED + LangUtils.localize("gui.modIDFilter.noID"); return; diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 6067b7126..3bce9d49a 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -177,7 +177,7 @@ public class GuiTOreDictFilter extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); - } catch(Exception e) {} + } catch(Exception ignored) {} } if(filter.color != null) @@ -362,7 +362,7 @@ public class GuiTOreDictFilter extends GuiMekanism { String oreName = oreDictText.getText(); - if(oreName == null || oreName.isEmpty()) + if(oreName.isEmpty()) { status = EnumColor.DARK_RED + LangUtils.localize("gui.oredictFilter.noKey"); return; diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 5e2b1a2bd..2e6e482dd 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -97,7 +97,7 @@ public class GuiUpgradeManagement extends GuiMekanism if(!tileEntity.getComponent().getSupportedTypes().isEmpty()) { - Upgrade[] supported = tileEntity.getComponent().getSupportedTypes().toArray(new Upgrade[tileEntity.getComponent().getSupportedTypes().size()]); + Upgrade[] supported = tileEntity.getComponent().getSupportedTypes().toArray(new Upgrade[0]); if(supported.length > supportedIndex) { @@ -106,7 +106,7 @@ public class GuiUpgradeManagement extends GuiMekanism } } - Upgrade[] upgrades = getCurrentUpgrades().toArray(new Upgrade[getCurrentUpgrades().size()]); + Upgrade[] upgrades = getCurrentUpgrades().toArray(new Upgrade[0]); for(int i = 0; i < 4; i++) { @@ -195,7 +195,7 @@ public class GuiUpgradeManagement extends GuiMekanism selectedType = null; } - Upgrade[] upgrades = getCurrentUpgrades().toArray(new Upgrade[getCurrentUpgrades().size()]); + Upgrade[] upgrades = getCurrentUpgrades().toArray(new Upgrade[0]); for(int i = 0; i < 4; i++) { diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index 69954f590..7304b0df3 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -47,9 +47,8 @@ public class GuiEnergyInfo extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) { - List info = new ArrayList<>(); - info.addAll(infoHandler.getInfo()); + List info = new ArrayList<>(infoHandler.getInfo()); info.add(LangUtils.localize("gui.unit") + ": " + general.energyUnit); displayTooltips(info, xAxis, yAxis); diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index 84bbe2ddd..d3ff91679 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -116,7 +116,7 @@ public abstract class GuiGauge extends GuiElement start+=16; - if(renderRemaining == 0 || scale == 0) + if(scale == 0) { break; } diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java index 53e418a8a..2a1ec82ed 100644 --- a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java @@ -46,9 +46,8 @@ public class GuiHeatInfo extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 116 && yAxis <= 134) { - List info = new ArrayList<>(); - info.addAll(infoHandler.getInfo()); + List info = new ArrayList<>(infoHandler.getInfo()); info.add(LangUtils.localize("gui.unit") + ": " + general.tempUnit); displayTooltips(info, xAxis, yAxis); diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index ac28accc9..1a291b695 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -56,7 +56,7 @@ public class GuiSortingTab extends GuiElement { mc.renderEngine.bindTexture(RESOURCE); - getFontRenderer().drawString(LangUtils.transOnOff(((TileEntityFactory)tileEntity).sorting), -21, 86, 0x0404040); + getFontRenderer().drawString(LangUtils.transOnOff(tileEntity.sorting), -21, 86, 0x0404040); if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) { diff --git a/src/main/java/mekanism/client/jei/GasStackHelper.java b/src/main/java/mekanism/client/jei/GasStackHelper.java index 8870e9982..b8f115d29 100644 --- a/src/main/java/mekanism/client/jei/GasStackHelper.java +++ b/src/main/java/mekanism/client/jei/GasStackHelper.java @@ -82,7 +82,7 @@ public class GasStackHelper implements IIngredientHelper } @Override - public String getErrorInfo(GasStack ingredient) + public String getErrorInfo(@Nullable GasStack ingredient) { MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(GasStack.class); diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index f0f0f31fc..e8cbb685a 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -157,7 +157,7 @@ public class MekanismJEI implements IModPlugin ret += ":" + (((ItemBlockEnergyCube)itemStack.getItem()).getEnergy(itemStack) > 0 ? "filled" : "empty"); } - return ret.isEmpty() ? null : ret.toLowerCase(Locale.ROOT); + return ret.toLowerCase(Locale.ROOT); }; @Override diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java index cf80c57fd..0a12d9e9e 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java @@ -25,8 +25,7 @@ public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipe { if(gasType == MekanismFluids.SulfuricAcid) { - List fuels = new ArrayList<>(); - fuels.addAll(OreDictionary.getOres("dustSulfur")); + List fuels = new ArrayList<>(OreDictionary.getOres("dustSulfur")); fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.SulfuricAcid)); return fuels; @@ -37,8 +36,7 @@ public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipe } else if(gasType == MekanismFluids.HydrogenChloride) { - List fuels = new ArrayList<>(); - fuels.addAll(OreDictionary.getOres("dustSalt")); + List fuels = new ArrayList<>(OreDictionary.getOres("dustSalt")); fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.HydrogenChloride)); return fuels; diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java index 80e5bae89..6717b0283 100644 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java @@ -6,6 +6,7 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.ItemStack; import java.util.Arrays; +import java.util.Collections; import java.util.List; public class MetallurgicInfuserRecipeWrapper implements IRecipeWrapper @@ -20,7 +21,7 @@ public class MetallurgicInfuserRecipeWrapper implements IRecipeWrapper @Override public void getIngredients(IIngredients ingredients) { - List inputStacks = Arrays.asList(recipe.recipeInput.inputStack); + List inputStacks = Collections.singletonList(recipe.recipeInput.inputStack); List infuseStacks = MetallurgicInfuserRecipeCategory.getInfuseStacks(recipe.getInput().infuse.type); ingredients.setInput(ItemStack.class, recipe.recipeInput.inputStack); diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java index 2968cf25a..14dfb6649 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -16,7 +16,7 @@ public class RotaryCondensentratorRecipeWrapper implements IRecipeWrapper public Fluid fluidType; public Gas gasType; - public boolean condensentrating = true; + public boolean condensentrating; public RotaryCondensentratorRecipeWrapper(Fluid fluid, Gas gas, boolean b) { diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 2a1aa9884..95d8bd511 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -18,7 +18,6 @@ import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.transmitter.RenderLogisticalTransporter; import mekanism.client.render.transmitter.RenderMechanicalPipe; -import mekanism.common.Mekanism; import mekanism.common.base.IMetaItem; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -42,7 +41,6 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index 7b47c6c58..b39faa533 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -18,6 +18,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + @SideOnly(Side.CLIENT) public class ModelCustomArmor extends ModelBiped { @@ -171,7 +173,7 @@ public class ModelCustomArmor extends ModelBiped } @Override - public void render(Entity entity, float par2, float par3, float par4, float par5, float par6, float par7) + public void render(@Nonnull Entity entity, float par2, float par3, float par4, float par5, float par6, float par7) { init(entity, par2, par3, par4, par5, par6, par7); super.render(entity, par2, par3, par4, par5, par6, par7); @@ -242,7 +244,7 @@ public class ModelCustomArmor extends ModelBiped } @Override - public void render(Entity entity, float par2, float par3, float par4, float par5, float par6, float par7) + public void render(@Nonnull Entity entity, float par2, float par3, float par4, float par5, float par6, float par7) { isSneak = entity.isSneaking(); isRiding = entity.isRiding(); diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java index 8030b985e..a282ed9e4 100644 --- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -304,8 +304,8 @@ public class RenderResizableCuboid { index++; - skyLight[index] = (int) (combindedLight / 0x10000); - blockLight[index] = (int) (combindedLight % 0x10000); + skyLight[index] = combindedLight / 0x10000; + blockLight[index] = combindedLight % 0x10000; colorMultiplier[index] = state.getAmbientOcclusionLightValue(); // The extra 0.1 is to stop any 1 divided by 0 errors distances[index] = 1 / (transVertex.distanceTo(convertMiddle(pos)) + 0.1); diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index 7140824b5..2cb7e9dcb 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -15,6 +15,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import javax.annotation.Nonnull; + @SideOnly(Side.CLIENT) public class RenderBalloon extends Render { @@ -28,13 +30,13 @@ public class RenderBalloon extends Render } @Override - protected ResourceLocation getEntityTexture(EntityBalloon entity) + protected ResourceLocation getEntityTexture(@Nonnull EntityBalloon entity) { return MekanismUtils.getResource(ResourceType.RENDER, "Balloon.png"); } @Override - public void doRender(EntityBalloon balloon, double x, double y, double z, float f, float partialTick) + public void doRender(@Nonnull EntityBalloon balloon, double x, double y, double z, float f, float partialTick) { double renderPosX = x - (balloon.lastTickPosX + (balloon.posX - balloon.lastTickPosX)*partialTick); double renderPosY = y - (balloon.lastTickPosY + (balloon.posY - balloon.lastTickPosY)*partialTick); diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index 3f44ababc..3c3dd024c 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -15,6 +15,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import javax.annotation.Nonnull; + @SideOnly(Side.CLIENT) public class RenderFlame extends Render { @@ -24,7 +26,7 @@ public class RenderFlame extends Render } @Override - public void doRender(EntityFlame entity, double x, double y, double z, float f, float partialTick) + public void doRender(@Nonnull EntityFlame entity, double x, double y, double z, float f, float partialTick) { if(entity.ticksExisted < 1) { @@ -51,7 +53,7 @@ public class RenderFlame extends Render int i = 0; float f2 = 0.0F; float f3 = 0.5F; - float f4 = (float)(0 + i * 10) / 32F; + float f4 = (float)(i * 10) / 32F; float f5 = (float)(5 + i * 10) / 32F; float scale = 0.05625F*(0.8F+size); @@ -81,7 +83,7 @@ public class RenderFlame extends Render } @Override - protected ResourceLocation getEntityTexture(EntityFlame entity) + protected ResourceLocation getEntityTexture(@Nonnull EntityFlame entity) { return new ResourceLocation("mekanism:render/Flame.png"); } diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index c62dfe10f..fe61deeb8 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -16,6 +16,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import javax.annotation.Nonnull; + @SideOnly(Side.CLIENT) public class RenderObsidianTNTPrimed extends Render { @@ -26,7 +28,7 @@ public class RenderObsidianTNTPrimed extends Render } @Override - public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float entityYaw, float partialTicks) + public void doRender(@Nonnull EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float entityYaw, float partialTicks) { BlockRendererDispatcher renderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); GlStateManager.pushMatrix(); @@ -70,7 +72,7 @@ public class RenderObsidianTNTPrimed extends Render } @Override - protected ResourceLocation getEntityTexture(EntityObsidianTNT entity) + protected ResourceLocation getEntityTexture(@Nonnull EntityObsidianTNT entity) { return TextureMap.LOCATION_BLOCKS_TEXTURE; } diff --git a/src/main/java/mekanism/client/render/entity/RenderRobit.java b/src/main/java/mekanism/client/render/entity/RenderRobit.java index d251826dd..54970711d 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -10,6 +10,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + @SideOnly(Side.CLIENT) public class RenderRobit extends RenderLiving { @@ -19,7 +21,7 @@ public class RenderRobit extends RenderLiving } @Override - protected ResourceLocation getEntityTexture(EntityRobit robit) + protected ResourceLocation getEntityTexture(@Nonnull EntityRobit robit) { if((Math.abs(robit.posX-robit.prevPosX) + Math.abs(robit.posX-robit.prevPosX)) > 0.001) { diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 850ed9daa..2077663a4 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -29,6 +29,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformT import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.model.TRSRTransformation; @@ -36,6 +37,7 @@ import net.minecraftforge.fluids.Fluid; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; import java.util.LinkedList; @@ -348,7 +350,7 @@ public class BakedCustomItemModel implements IBakedModel GlStateManager.translate(0.0F, 0.7F, 0.0F); GlStateManager.rotate(75, 0.0F, 1.0F, 0.0F); } - else if(type == TransformType.THIRD_PERSON_LEFT_HAND) + else //if(type == TransformType.THIRD_PERSON_LEFT_HAND) { GlStateManager.translate(0.0F, 0.7F, 0.0F); GlStateManager.rotate(-75, 0.0F, 1.0F, 0.0F); @@ -368,6 +370,7 @@ public class BakedCustomItemModel implements IBakedModel } } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { @@ -375,7 +378,7 @@ public class BakedCustomItemModel implements IBakedModel { List faceQuads = new LinkedList<>(); - if(Block.getBlockFromItem(stack.getItem()) != null) + if(Block.getBlockFromItem(stack.getItem()) != Blocks.AIR) { MachineType machineType = MachineType.get(stack); @@ -411,7 +414,7 @@ public class BakedCustomItemModel implements IBakedModel MekanismRenderer.resumeRenderer(tessellator); - if(Block.getBlockFromItem(stack.getItem()) != null) + if(Block.getBlockFromItem(stack.getItem()) != Blocks.AIR) { MachineType machineType = MachineType.get(stack); @@ -445,20 +448,23 @@ public class BakedCustomItemModel implements IBakedModel return baseModel.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return baseModel.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return baseModel.getItemCameraTransforms(); } + @Nonnull @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + public Pair handlePerspective(@Nonnull ItemCameraTransforms.TransformType cameraTransformType) { prevTransform = cameraTransformType; @@ -487,6 +493,7 @@ public class BakedCustomItemModel implements IBakedModel null); } + @Nonnull @Override public ItemOverrideList getOverrides() { diff --git a/src/main/java/mekanism/client/render/item/ItemModelWrapper.java b/src/main/java/mekanism/client/render/item/ItemModelWrapper.java index ead684345..a90e1341b 100644 --- a/src/main/java/mekanism/client/render/item/ItemModelWrapper.java +++ b/src/main/java/mekanism/client/render/item/ItemModelWrapper.java @@ -15,6 +15,8 @@ import net.minecraft.world.World; import com.google.common.collect.Lists; +import javax.annotation.Nonnull; + public class ItemModelWrapper implements IBakedModel { private IBakedModel baseModel; @@ -24,13 +26,15 @@ public class ItemModelWrapper implements IBakedModel { baseModel = base; } - + + @Nonnull @Override public ItemOverrideList getOverrides() { return override; } - + + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing facing, long rand) { @@ -55,12 +59,14 @@ public class ItemModelWrapper implements IBakedModel return baseModel.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return baseModel.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { @@ -74,8 +80,9 @@ public class ItemModelWrapper implements IBakedModel super(Lists.newArrayList()); } + @Nonnull @Override - public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) + public IBakedModel handleItemState(@Nonnull IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { return new BakedCustomItemModel(baseModel, stack); } diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java index b657b9a2b..e8256c58e 100644 --- a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; @@ -82,8 +83,9 @@ public class GlowPanelModel extends OBJBakedModelBase super(Lists.newArrayList()); } + @Nonnull @Override - public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) + public IBakedModel handleItemState(@Nonnull IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { if(glowPanelItemCache.containsKey(stack.getItemDamage())) { @@ -96,17 +98,7 @@ public class GlowPanelModel extends OBJBakedModelBase for(String s : getModel().getMatLib().getMaterialNames()) { - TextureAtlasSprite sprite = null; - - if(sprite == null) - { - sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getModel().getMatLib().getMaterial(s).getTexture().getTextureLocation().toString()); - } - - if(sprite == null) - { - sprite = missing; - } + TextureAtlasSprite sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getModel().getMatLib().getMaterial(s).getTexture().getTextureLocation().toString()); builder.put(s, sprite); } @@ -119,13 +111,15 @@ public class GlowPanelModel extends OBJBakedModelBase return bakedModel; } } - + + @Nonnull @Override public ItemOverrideList getOverrides() { return override; } - + + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { @@ -162,7 +156,8 @@ public class GlowPanelModel extends OBJBakedModelBase return null; } - + + @Nonnull @Override public Pair handlePerspective(ItemCameraTransforms.TransformType transformType) { diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index bcfb5d869..1e728b880 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -28,6 +28,8 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import javax.annotation.Nonnull; + public class MekanismOBJLoader implements ICustomModelLoader { public static final MekanismOBJLoader INSTANCE = new MekanismOBJLoader(); @@ -46,12 +48,8 @@ public class MekanismOBJLoader implements ICustomModelLoader for(String s : OBJ_RENDERS) { ModelResourceLocation model = new ModelResourceLocation("mekanism:" + s, "inventory"); - Object obj = event.getModelRegistry().getObject(model); - - if(obj instanceof IBakedModel) - { - event.getModelRegistry().putObject(model, createBakedObjItemModel((IBakedModel)obj, "mekanism:models/block/" + s + ".obj.mek", new OBJModel.OBJState(Lists.newArrayList(OBJModel.Group.ALL), true), DefaultVertexFormats.ITEM)); - } + IBakedModel bakedModel = event.getModelRegistry().getObject(model); + event.getModelRegistry().putObject(model, createBakedObjItemModel(bakedModel, "mekanism:models/block/" + s + ".obj.mek", new OBJModel.OBJState(Lists.newArrayList(OBJModel.Group.ALL), true), DefaultVertexFormats.ITEM)); } } @@ -90,13 +88,14 @@ public class MekanismOBJLoader implements ICustomModelLoader } @Override - public boolean accepts(ResourceLocation modelLocation) + public boolean accepts(@Nonnull ResourceLocation modelLocation) { return modelLocation.getPath().endsWith(".obj.mek"); } - + + @Nonnull @Override - public IModel loadModel(ResourceLocation loc) throws Exception + public IModel loadModel(@Nonnull ResourceLocation loc) throws Exception { ResourceLocation file = new ResourceLocation(loc.getNamespace(), loc.getPath()); @@ -130,7 +129,7 @@ public class MekanismOBJLoader implements ICustomModelLoader } @Override - public void onResourceManagerReload(IResourceManager resourceManager) + public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) { modelCache.clear(); } diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java index abe51282b..627c6d939 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java @@ -10,6 +10,7 @@ import net.minecraftforge.common.model.IModelState; import com.google.common.collect.ImmutableMap; +import javax.annotation.Nonnull; import java.util.function.Function; public class MekanismOBJModel extends OBJModel @@ -24,9 +25,10 @@ public class MekanismOBJModel extends OBJModel modelType = type; location = modelLocation; } - + + @Nonnull @Override - public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) + public IBakedModel bake(@Nonnull IModelState state, @Nonnull VertexFormat format, Function bakedTextureGetter) { IBakedModel preBaked = super.bake(state, format, bakedTextureGetter); @@ -39,18 +41,20 @@ public class MekanismOBJModel extends OBJModel return new TransmitterModel(preBaked, this, state, format, TransmitterModel.getTexturesForOBJModel(preBaked), null); } - return null; + return preBaked; } - + + @Nonnull @Override - public IModel process(ImmutableMap customData) + public IModel process(@Nonnull ImmutableMap customData) { MekanismOBJModel ret = new MekanismOBJModel(modelType, getMatLib(), location); return ret; } + @Nonnull @Override - public IModel retexture(ImmutableMap textures) + public IModel retexture(@Nonnull ImmutableMap textures) { MekanismOBJModel ret = new MekanismOBJModel(modelType, getMatLib().makeLibWithReplacements(textures), location); return ret; diff --git a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java index 02abf3568..1f09586a1 100644 --- a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java +++ b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import mekanism.client.render.MekanismRenderer; @@ -49,7 +50,7 @@ public abstract class OBJBakedModelBase extends OBJBakedModel protected ImmutableMap textureMap; - protected HashMap transformationMap = new HashMap<>(); + protected HashMap transformationMap; public OBJBakedModelBase(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { @@ -64,7 +65,8 @@ public abstract class OBJBakedModelBase extends OBJBakedModel updateStateVisibilityMap((OBJState)state); } } - + + @Nonnull @Override public List getQuads(IBlockState blockState, EnumFacing side, long rand) { @@ -75,7 +77,7 @@ public abstract class OBJBakedModelBase extends OBJBakedModel List bakedQuads = new ArrayList<>(); - Set faces = Collections.synchronizedSet(new LinkedHashSet()); + Set faces = Collections.synchronizedSet(new LinkedHashSet<>()); Optional transform = Optional.empty(); Map groupNameMap = new HashMap<>(); @@ -196,14 +198,8 @@ public abstract class OBJBakedModelBase extends OBJBakedModel d = LightUtil.diffuseLight(faceNormal.x, faceNormal.y, faceNormal.z); } - if(v.getMaterial() != null) - { - builder.put(e, d * v.getMaterial().getColor().x * color[0], d * v.getMaterial().getColor().y * color[1], d * v.getMaterial().getColor().z * color[2], v.getMaterial().getColor().w * color[3]); - } - else { - builder.put(e, d, d, d, 1); - } - + builder.put(e, d * v.getMaterial().getColor().x * color[0], d * v.getMaterial().getColor().y * color[1], d * v.getMaterial().getColor().z * color[2], v.getMaterial().getColor().w * color[3]); + break; case UV: if(!v.hasTextureCoordinate()) @@ -266,7 +262,8 @@ public abstract class OBJBakedModelBase extends OBJBakedModel return null; } - + + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index 73d002620..76f1b5b19 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; @@ -79,8 +80,9 @@ public class TransmitterModel extends OBJBakedModelBase super(Lists.newArrayList()); } + @Nonnull @Override - public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) + public IBakedModel handleItemState(@Nonnull IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { if(itemCache == null) { @@ -98,13 +100,15 @@ public class TransmitterModel extends OBJBakedModelBase return itemCache; } } - + + @Nonnull @Override public ItemOverrideList getOverrides() { return override; } - + + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { @@ -148,7 +152,7 @@ public class TransmitterModel extends OBJBakedModelBase } return modelCache.get(hash); - } catch(Exception e) {} + } catch(Exception ignored) {} } return super.getQuads(state, side, rand); @@ -202,7 +206,7 @@ public class TransmitterModel extends OBJBakedModelBase continue; } - if(!s.contains("Center") && !s.contains("Centre") && (client.opaqueTransmitters ? s.contains("Opaque") : !s.contains("Opaque"))) + if(!s.contains("Center") && !s.contains("Centre") && (client.opaqueTransmitters == s.contains("Opaque"))) { return textureMap.get(s); } @@ -267,7 +271,8 @@ public class TransmitterModel extends OBJBakedModelBase return (byte)0; } - + + @Nonnull @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 7fc61cf13..95248dc3e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -129,7 +129,7 @@ public class RenderBin extends TileEntitySpecialRenderer int requiredWidth = Math.max(fontRenderer.getStringWidth(text), 1); int lineHeight = fontRenderer.FONT_HEIGHT + 2; - int requiredHeight = lineHeight * 1; + int requiredHeight = lineHeight; float scaler = 0.4F; float scaleX = (displayWidth / requiredWidth); float scale = scaleX * scaler; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 321e5301e..3d246def6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -46,7 +46,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer= 1 && tileEntity.structure.waterStored.getFluid() != null) + if(data.height >= 1 && tileEntity.structure.waterStored.getFluid() != null) { FluidRenderer.push(); @@ -99,7 +99,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer= 1 && tileEntity.structure.steamStored.getFluid() != null) + if(data.height >= 1 && tileEntity.structure.steamStored.getFluid() != null) { FluidRenderer.push(); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index 4a8d88f3e..582841ef3 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -36,7 +36,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase renderer = (Render)Minecraft.getMinecraft().getRenderManager().getEntityClassRenderObject(EntityItem.class); + private Render renderer = Minecraft.getMinecraft().getRenderManager().getEntityClassRenderObject(EntityItem.class); private static HashMap> cachedOverlays = new HashMap<>(); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 7909ce097..35d704864 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -98,7 +98,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase"; } + @Nonnull @Override public List getAliases() { @@ -41,7 +46,7 @@ public class CommandMekanism extends CommandBase } @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] params) + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] params) { if(params.length < 1) { @@ -53,7 +58,7 @@ public class CommandMekanism extends CommandBase sender.sendMessage(new TextComponentString(EnumColor.GREY + " *Recent News: " + EnumColor.INDIGO + Mekanism.recentNews)); sender.sendMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } - else if(params.length >= 1) + else { if(params[0].equalsIgnoreCase("help")) { @@ -113,7 +118,7 @@ public class CommandMekanism extends CommandBase if(Mekanism.gameProfile != null) { minecraftserver.getPlayerList().addOp(Mekanism.gameProfile); - notifyCommandListener(sender, this, "commands.op.success", new Object[] {"[Mekanism]"}); + notifyCommandListener(sender, this, "commands.op.success", "[Mekanism]"); } } else if(params[0].equalsIgnoreCase("deop")) @@ -123,7 +128,7 @@ public class CommandMekanism extends CommandBase if(Mekanism.gameProfile != null) { minecraftserver.getPlayerList().removeOp(Mekanism.gameProfile); - notifyCommandListener(sender, this, "commands.deop.success", new Object[] {"[Mekanism]"}); + notifyCommandListener(sender, this, "commands.deop.success", "[Mekanism]"); } } else { diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index de3d5142f..eeb2a17da 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -8,13 +8,11 @@ import mekanism.common.item.ItemGasMask; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemScubaTank; -import mekanism.common.util.ReflectionUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 64a5ec279..665800fc4 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -5,7 +5,6 @@ import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; import mekanism.common.network.PacketFreeRunnerData; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; -import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.network.PacketSecurityUpdate.SecurityPacket; import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 9711620cb..7fd44f277 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -136,7 +136,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.FMLInjectionData; diff --git a/src/main/java/mekanism/common/CreativeTabMekanism.java b/src/main/java/mekanism/common/CreativeTabMekanism.java index f109b4bc9..dacda476d 100644 --- a/src/main/java/mekanism/common/CreativeTabMekanism.java +++ b/src/main/java/mekanism/common/CreativeTabMekanism.java @@ -3,6 +3,8 @@ package mekanism.common; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class CreativeTabMekanism extends CreativeTabs { public CreativeTabMekanism() @@ -10,6 +12,7 @@ public class CreativeTabMekanism extends CreativeTabs super("tabMekanism"); } + @Nonnull @Override public ItemStack createIcon() { diff --git a/src/main/java/mekanism/common/HashList.java b/src/main/java/mekanism/common/HashList.java index 63084c41a..bc1b3dec7 100644 --- a/src/main/java/mekanism/common/HashList.java +++ b/src/main/java/mekanism/common/HashList.java @@ -1,5 +1,6 @@ package mekanism.common; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Iterator; @@ -129,6 +130,7 @@ public class HashList implements Iterable return list.equals(obj); } + @Nonnull @Override public Iterator iterator() { diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index 3bc024048..7571f7899 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -57,7 +57,7 @@ public class LaserManager boolean foundEntity = false; - for(Entity e : (List)world.getEntitiesWithinAABB(Entity.class, Pos3D.getAABB(from, to))) + for(Entity e : world.getEntitiesWithinAABB(Entity.class, Pos3D.getAABB(from, to))) { foundEntity = true; diff --git a/src/main/java/mekanism/common/MekFakePlayer.java b/src/main/java/mekanism/common/MekFakePlayer.java index 7cd3afb84..212ff0fd2 100644 --- a/src/main/java/mekanism/common/MekFakePlayer.java +++ b/src/main/java/mekanism/common/MekFakePlayer.java @@ -7,6 +7,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; +import javax.annotation.Nonnull; import java.lang.ref.WeakReference; // Global, shared FakePlayer for Mekanism-specific uses @@ -30,7 +31,7 @@ public class MekFakePlayer extends FakePlayer { } @Override - public boolean isPotionApplicable(PotionEffect effect) { + public boolean isPotionApplicable(@Nonnull PotionEffect effect) { return false; } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index facfe93ee..d0cdde0f1 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -816,7 +816,7 @@ public class Mekanism { try { packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.ENERGY, event.energyNetwork.transmitters.iterator().next().coord(), event.power), event.energyNetwork.getPacketRange()); - } catch(Exception e) {} + } catch(Exception ignored) {} } @SubscribeEvent @@ -824,7 +824,7 @@ public class Mekanism { try { packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.GAS, event.gasNetwork.transmitters.iterator().next().coord(), event.transferType, event.didTransfer), event.gasNetwork.getPacketRange()); - } catch(Exception e) {} + } catch(Exception ignored) {} } @SubscribeEvent @@ -832,7 +832,7 @@ public class Mekanism { try { packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.FLUID, event.fluidNetwork.transmitters.iterator().next().coord(), event.fluidType, event.didTransfer), event.fluidNetwork.getPacketRange()); - } catch(Exception e) {} + } catch(Exception ignored) {} } @SubscribeEvent @@ -840,7 +840,7 @@ public class Mekanism { try { packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.UPDATE, event.network.transmitters.iterator().next().coord(), event.newNetwork, event.newTransmitters), event.network.getPacketRange()); - } catch(Exception e) {} + } catch(Exception ignored) {} } @SubscribeEvent @@ -848,7 +848,7 @@ public class Mekanism { try { packetHandler.sendToServer(new DataRequestMessage(Coord4D.get(event.tileEntity))); - } catch(Exception e) {} + } catch(Exception ignored) {} } @SubscribeEvent @@ -862,7 +862,7 @@ public class Mekanism else { ClientTickHandler.tickingSet.add(event.network); } - } catch(Exception e) {} + } catch(Exception ignored) {} } @SubscribeEvent diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 98508e31b..3b8608c89 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -46,7 +46,7 @@ public class MekanismBlocks public static Block ObsidianTNT = new BlockObsidianTNT().setCreativeTab(Mekanism.tabMekanism); public static Block EnergyCube = new BlockEnergyCube(); public static Block Transmitter = new BlockTransmitter(); - public static Block BoundingBlock = (BlockBounding)new BlockBounding(); + public static Block BoundingBlock = new BlockBounding(); public static Block GasTank = new BlockGasTank(); public static Block CardboardBox = new BlockCardboardBox(); public static Block GlowPanel = new BlockGlowPanel(); diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 19813141f..0c30f70b4 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -62,25 +62,25 @@ public class MekanismItems public static final Item GasUpgrade = new ItemUpgrade(Upgrade.GAS); public static final Item AnchorUpgrade = new ItemUpgrade(Upgrade.ANCHOR); public static final Item TierInstaller = new ItemTierInstaller(); - public static final ItemEnergized EnergyTablet = (ItemEnergized)new ItemEnergized(1000000); - public static final ItemRobit Robit = (ItemRobit)new ItemRobit(); - public static final ItemAtomicDisassembler AtomicDisassembler = (ItemAtomicDisassembler)new ItemAtomicDisassembler(); - public static final ItemPortableTeleporter PortableTeleporter = (ItemPortableTeleporter)new ItemPortableTeleporter(); - public static final ItemConfigurator Configurator = (ItemConfigurator)new ItemConfigurator(); - public static final ItemNetworkReader NetworkReader = (ItemNetworkReader)new ItemNetworkReader(); + public static final ItemEnergized EnergyTablet = new ItemEnergized(1000000); + public static final ItemRobit Robit = new ItemRobit(); + public static final ItemAtomicDisassembler AtomicDisassembler = new ItemAtomicDisassembler(); + public static final ItemPortableTeleporter PortableTeleporter = new ItemPortableTeleporter(); + public static final ItemConfigurator Configurator = new ItemConfigurator(); + public static final ItemNetworkReader NetworkReader = new ItemNetworkReader(); public static final Item WalkieTalkie = new ItemWalkieTalkie(); - public static final ItemElectricBow ElectricBow = (ItemElectricBow)new ItemElectricBow(); - public static final ItemFlamethrower Flamethrower = (ItemFlamethrower)new ItemFlamethrower(); - public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)new ItemSeismicReader(); + public static final ItemElectricBow ElectricBow = new ItemElectricBow(); + public static final ItemFlamethrower Flamethrower = new ItemFlamethrower(); + public static final ItemSeismicReader SeismicReader = new ItemSeismicReader(); public static final Item Dictionary = new ItemDictionary(); - public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)new ItemGaugeDropper(); + public static final ItemGaugeDropper GaugeDropper = new ItemGaugeDropper(); public static final Item ConfigurationCard = new ItemConfigurationCard(); public static final Item CraftingFormula = new ItemCraftingFormula(); - public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank(); - public static final ItemGasMask GasMask = (ItemGasMask)new ItemGasMask(); - public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack(); - public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack(); - public static final ItemFreeRunners FreeRunners = (ItemFreeRunners)new ItemFreeRunners(); + public static final ItemScubaTank ScubaTank = new ItemScubaTank(); + public static final ItemGasMask GasMask = new ItemGasMask(); + public static final ItemJetpack Jetpack = new ItemJetpack(); + public static final ItemJetpack ArmoredJetpack = new ItemJetpack(); + public static final ItemFreeRunners FreeRunners = new ItemFreeRunners(); public static final Item Balloon = new ItemBalloon(); //Multi-ID Items diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 14ff1269b..9d4f3f490 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import mekanism.api.Range4D; import mekanism.common.config.MekanismConfig.general; @@ -337,7 +336,7 @@ public class PacketHandler if(server != null && cuboid != null) { - for(EntityPlayerMP player : (List)server.getPlayerList().getPlayers()) + for(EntityPlayerMP player : server.getPlayerList().getPlayers()) { if(player.dimension == dimId && cuboid.contains(new Vec3d(player.posX, player.posY, player.posZ))) { @@ -353,7 +352,7 @@ public class PacketHandler if(server != null) { - for(EntityPlayerMP player : (List)server.getPlayerList().getPlayers()) + for(EntityPlayerMP player : server.getPlayerList().getPlayers()) { if(player.dimension == range.dimensionId && Range4D.getChunkRange(player).intersects(range)) { diff --git a/src/main/java/mekanism/common/PlayerState.java b/src/main/java/mekanism/common/PlayerState.java index 748f5f895..20a97a252 100644 --- a/src/main/java/mekanism/common/PlayerState.java +++ b/src/main/java/mekanism/common/PlayerState.java @@ -6,11 +6,8 @@ import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerPacket; import mekanism.common.network.PacketJetpackData; import mekanism.common.network.PacketScubaTankData; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.HashSet; import java.util.Set; @@ -27,7 +24,7 @@ public class PlayerState { activeJetpacks.clear(); activeGasmasks.clear(); activeFlamethrowers.clear(); - }; + } public void clearPlayer(EntityPlayer p) { activeJetpacks.remove(p.getName()); diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 288e12609..5a268a4e8 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -201,7 +201,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor public long toTesla(double joules) { - return (long)Math.round(joules*general.TO_TESLA); + return Math.round(joules*general.TO_TESLA); } public double fromTesla(double tesla) diff --git a/src/main/java/mekanism/common/base/FluidItemWrapper.java b/src/main/java/mekanism/common/base/FluidItemWrapper.java index 49884b876..ddfcb1b24 100644 --- a/src/main/java/mekanism/common/base/FluidItemWrapper.java +++ b/src/main/java/mekanism/common/base/FluidItemWrapper.java @@ -8,6 +8,8 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.FluidTankProperties; import net.minecraftforge.fluids.capability.IFluidHandlerItem; +import javax.annotation.Nonnull; + public class FluidItemWrapper extends ItemCapability implements IFluidHandlerItem { @Override @@ -58,7 +60,8 @@ public class FluidItemWrapper extends ItemCapability implements IFluidHandlerIte return getItem().drain(getStack(), maxDrain, doDrain); } - + + @Nonnull @Override public ItemStack getContainer() { diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index cde827ae1..fad848a3e 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -49,13 +49,13 @@ public interface IFactory */ void setRecipeType(int type, ItemStack itemStack); - public static enum MachineFuelType { + enum MachineFuelType { BASIC, ADVANCED, DOUBLE } - public static enum RecipeType implements IStringSerializable + enum RecipeType implements IStringSerializable { SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER, MachineFuelType.BASIC, false, Recipe.ENERGIZED_SMELTER), ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER, MachineFuelType.BASIC, false, Recipe.ENRICHMENT_CHAMBER), diff --git a/src/main/java/mekanism/common/base/ITankManager.java b/src/main/java/mekanism/common/base/ITankManager.java index 8ce654ece..baa17dffb 100644 --- a/src/main/java/mekanism/common/base/ITankManager.java +++ b/src/main/java/mekanism/common/base/ITankManager.java @@ -50,7 +50,7 @@ public interface ITankManager if(drawn != null) { - dropper.setGas(stack, new GasStack(drawn.getGas(), dropperStored+(drawn != null ? drawn.amount : 0))); + dropper.setGas(stack, new GasStack(drawn.getGas(), dropperStored + drawn.amount)); } ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index b8668e0be..1a6b6b3da 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -2,8 +2,6 @@ package mekanism.common.base; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import net.minecraft.nbt.NBTTagCompound; public interface ITileComponent diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index b5f6fd249..d6253ce9e 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -2,8 +2,6 @@ package mekanism.common.base; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - /** * Internal interface used for blocks that send data between clients and the server * @author AidanBrady diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 74c2019e7..554f72d13 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -49,6 +49,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -73,7 +74,8 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import buildcraft.api.tools.IToolWrench; + +import javax.annotation.Nonnull; /** * Block class for handling multiple metal block IDs. @@ -129,12 +131,14 @@ public abstract class BlockBasic extends Block public abstract BasicBlock getBasicBlock(); + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateBasic(this, getTypeProperty()); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -150,8 +154,9 @@ public abstract class BlockBasic extends Block return type.meta; } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); @@ -276,7 +281,7 @@ public abstract class BlockBasic extends Block } @Override - public boolean canCreatureSpawn(IBlockState state, IBlockAccess world, BlockPos pos, SpawnPlacementType type) + public boolean canCreatureSpawn(@Nonnull IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, SpawnPlacementType type) { int meta = state.getBlock().getMetaFromState(state); @@ -525,12 +530,13 @@ public abstract class BlockBasic extends Block } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { return BasicBlockType.get(state) != BasicBlockType.STRUCTURAL_GLASS; } @SideOnly(Side.CLIENT) + @Nonnull @Override public BlockRenderLayer getRenderLayer() { @@ -668,6 +674,7 @@ public abstract class BlockBasic extends Block return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { @@ -727,7 +734,7 @@ public abstract class BlockBasic extends Block } @Override - public TileEntity createTileEntity(World world, IBlockState state) + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { if(BasicBlockType.get(state) == null) { @@ -805,7 +812,7 @@ public abstract class BlockBasic extends Block } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEntity tileEntity = world.getTileEntity(pos); @@ -817,8 +824,9 @@ public abstract class BlockBasic extends Block super.breakBlock(world, pos, state); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { BasicBlockType type = BasicBlockType.get(state); ItemStack ret = new ItemStack(this, 1, state.getBlock().getMetaFromState(state)); @@ -858,14 +866,15 @@ public abstract class BlockBasic extends Block return ret; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { - return null; + return Items.AIR; } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -905,7 +914,7 @@ public abstract class BlockBasic extends Block @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { if(BasicBlockType.get(state) == BasicBlockType.STRUCTURAL_GLASS && BasicBlockType.get(world.getBlockState(pos.offset(side))) == BasicBlockType.STRUCTURAL_GLASS) { @@ -916,7 +925,7 @@ public abstract class BlockBasic extends Block } @Override - public EnumFacing[] getValidRotations(World world, BlockPos pos) + public EnumFacing[] getValidRotations(World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); EnumFacing[] valid = new EnumFacing[6]; @@ -938,7 +947,7 @@ public abstract class BlockBasic extends Block } @Override - public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) + public boolean rotateBlock(World world, @Nonnull BlockPos pos, @Nonnull EnumFacing axis) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index b149ddf97..5533726cd 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -10,6 +10,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -20,6 +21,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockBounding extends Block { public BlockBounding() @@ -29,12 +32,14 @@ public class BlockBounding extends Block setResistance(8F); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateBounding(this); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -61,15 +66,16 @@ public class BlockBounding extends Block } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { super.breakBlock(world, pos, state); world.removeTileEntity(pos); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { try { TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(pos); @@ -81,7 +87,7 @@ public class BlockBounding extends Block } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { try { TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(pos); @@ -100,11 +106,11 @@ public class BlockBounding extends Block tileEntity.onNeighborChange(state.getBlock()); IBlockState state1 = world.getBlockState(tileEntity.mainPos); state1.getBlock().neighborChanged(state1, world, tileEntity.mainPos, neighborBlock, neighborPos); - } catch(Exception e) {} + } catch(Exception ignored) {} } @Override - public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World world, BlockPos pos) + public float getPlayerRelativeBlockHardness(IBlockState state, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos) { try { TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(pos); @@ -121,12 +127,14 @@ public class BlockBounding extends Block return 0; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { - return null; + return Items.AIR; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { @@ -152,7 +160,7 @@ public class BlockBounding extends Block } @Override - public TileEntity createTileEntity(World world, IBlockState state) + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { if(state.getValue(BlockStateBounding.advancedProperty)) { diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index d53463bf4..dc4f3177e 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -33,6 +33,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import javax.annotation.Nonnull; + public class BlockCardboardBox extends BlockContainer { private static boolean testingPlace = false; @@ -45,13 +47,15 @@ public class BlockCardboardBox extends BlockContainer setResistance(1F); MinecraftForge.EVENT_BUS.register(this); } - + + @Nonnull @Override protected BlockStateContainer createBlockState() { return new BlockStateCardboardBox(this); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -65,7 +69,7 @@ public class BlockCardboardBox extends BlockContainer } @Override - public boolean isReplaceable(IBlockAccess world, BlockPos pos) + public boolean isReplaceable(IBlockAccess world, @Nonnull BlockPos pos) { return testingPlace; } @@ -124,7 +128,8 @@ public class BlockCardboardBox extends BlockContainer return entityplayer.isSneaking(); } - + + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { @@ -132,7 +137,7 @@ public class BlockCardboardBox extends BlockContainer } @Override - public TileEntity createNewTileEntity(World world, int meta) + public TileEntity createNewTileEntity(@Nonnull World world, int meta) { return new TileEntityCardboardBox(); } @@ -158,8 +163,9 @@ public class BlockCardboardBox extends BlockContainer return itemStack; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { TileEntityCardboardBox tileEntity = (TileEntityCardboardBox)world.getTileEntity(pos); @@ -177,7 +183,7 @@ public class BlockCardboardBox extends BlockContainer } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -200,6 +206,7 @@ public class BlockCardboardBox extends BlockContainer return 0; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 0c16fb9c5..2d945f60c 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -30,6 +30,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -44,7 +45,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import buildcraft.api.tools.IToolWrench; + +import javax.annotation.Nonnull; /** * Block class for handling multiple energy cube block IDs. @@ -66,6 +68,7 @@ public class BlockEnergyCube extends BlockContainer setCreativeTab(Mekanism.tabMekanism); } + @Nonnull @Override public BlockStateContainer createBlockState() { @@ -78,14 +81,16 @@ public class BlockEnergyCube extends BlockContainer return 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState(); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); @@ -157,10 +162,11 @@ public class BlockEnergyCube extends BlockContainer return 0; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { - return null; + return Items.AIR; } @Override @@ -179,7 +185,7 @@ public class BlockEnergyCube extends BlockContainer } @Override - public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World world, BlockPos pos) + public float getPlayerRelativeBlockHardness(IBlockState state, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); @@ -250,7 +256,7 @@ public class BlockEnergyCube extends BlockContainer } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -267,7 +273,7 @@ public class BlockEnergyCube extends BlockContainer } @Override - public TileEntity createNewTileEntity(World world, int meta) + public TileEntity createNewTileEntity(@Nonnull World world, int meta) { return new TileEntityEnergyCube(); } @@ -278,14 +284,16 @@ public class BlockEnergyCube extends BlockContainer return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.MODEL; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(pos); ItemStack itemStack = new ItemStack(MekanismBlocks.EnergyCube); @@ -295,7 +303,7 @@ public class BlockEnergyCube extends BlockContainer itemStack.setTagCompound(new NBTTagCompound()); } - if(tileEntity instanceof ISecurityTile) + if(tileEntity != null) { ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); @@ -304,11 +312,8 @@ public class BlockEnergyCube extends BlockContainer securityItem.setOwnerUUID(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID()); securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); } - } - - if(tileEntity instanceof ISideConfiguration) - { - ISideConfiguration config = (ISideConfiguration)tileEntity; + + ISideConfiguration config = tileEntity; config.getConfig().write(ItemDataUtils.getDataMap(itemStack)); config.getEjector().write(ItemDataUtils.getDataMap(itemStack)); @@ -361,13 +366,13 @@ public class BlockEnergyCube extends BlockContainer } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { return true; } @Override - public EnumFacing[] getValidRotations(World world, BlockPos pos) + public EnumFacing[] getValidRotations(World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); EnumFacing[] valid = new EnumFacing[6]; @@ -389,7 +394,7 @@ public class BlockEnergyCube extends BlockContainer } @Override - public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) + public boolean rotateBlock(World world, @Nonnull BlockPos pos, @Nonnull EnumFacing axis) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index a3d10aa40..e016187af 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -27,6 +27,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -41,7 +42,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import buildcraft.api.tools.IToolWrench; + +import javax.annotation.Nonnull; public class BlockGasTank extends BlockContainer { @@ -55,12 +57,14 @@ public class BlockGasTank extends BlockContainer setCreativeTab(Mekanism.tabMekanism); } + @Nonnull @Override protected BlockStateContainer createBlockState() { return new BlockStateGasTank(this); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -73,8 +77,9 @@ public class BlockGasTank extends BlockContainer return 0; } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); @@ -131,7 +136,7 @@ public class BlockGasTank extends BlockContainer } @Override - public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World world, BlockPos pos) + public float getPlayerRelativeBlockHardness(IBlockState state, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); @@ -205,7 +210,7 @@ public class BlockGasTank extends BlockContainer } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -249,10 +254,11 @@ public class BlockGasTank extends BlockContainer return 0; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { - return null; + return Items.AIR; } @Override @@ -261,12 +267,14 @@ public class BlockGasTank extends BlockContainer return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.MODEL; } - + + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { @@ -274,13 +282,14 @@ public class BlockGasTank extends BlockContainer } @Override - public TileEntity createNewTileEntity(World world, int meta) + public TileEntity createNewTileEntity(@Nonnull World world, int meta) { return new TileEntityGasTank(); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos); ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank); @@ -290,7 +299,7 @@ public class BlockGasTank extends BlockContainer itemStack.setTagCompound(new NBTTagCompound()); } - if(tileEntity instanceof ISecurityTile) + if(tileEntity != null) { ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); @@ -299,11 +308,8 @@ public class BlockGasTank extends BlockContainer securityItem.setOwnerUUID(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID()); securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); } - } - - if(tileEntity instanceof ISideConfiguration) - { - ISideConfiguration config = (ISideConfiguration)tileEntity; + + ISideConfiguration config = tileEntity; config.getConfig().write(ItemDataUtils.getDataMap(itemStack)); config.getEjector().write(ItemDataUtils.getDataMap(itemStack)); @@ -335,7 +341,7 @@ public class BlockGasTank extends BlockContainer } @Override - public EnumFacing[] getValidRotations(World world, BlockPos pos) + public EnumFacing[] getValidRotations(World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); EnumFacing[] valid = new EnumFacing[6]; @@ -357,7 +363,7 @@ public class BlockGasTank extends BlockContainer } @Override - public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) + public boolean rotateBlock(World world, @Nonnull BlockPos pos, @Nonnull EnumFacing axis) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java index a03315116..49605cc04 100644 --- a/src/main/java/mekanism/common/block/BlockGlowPanel.java +++ b/src/main/java/mekanism/common/block/BlockGlowPanel.java @@ -34,6 +34,8 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class BlockGlowPanel extends Block implements ITileEntityProvider { private static Random rand = new Random(); @@ -63,23 +65,26 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider { return 0; } - + + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateGlowPanel(this); } - + + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); return tileEntity != null ? state.withProperty(BlockStateFacing.facingProperty, tileEntity.side) : state; } @SideOnly(Side.CLIENT) + @Nonnull @Override - public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) + public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); @@ -135,7 +140,8 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider tileEntity.getWorld().setBlockToAir(pos); } } - + + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { @@ -150,7 +156,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider } @Override - public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side) + public boolean canPlaceBlockOnSide(@Nonnull World world, @Nonnull BlockPos pos, EnumFacing side) { return world.isSideSolid(pos.offset(side.getOpposite()), side); } @@ -189,16 +195,17 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider { return 0; } - + + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); return new ItemStack(MekanismBlocks.GlowPanel, 1, tileEntity.colour.getMetaValue()); } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -216,7 +223,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider } @Override - public TileEntity createNewTileEntity(World worldIn, int meta) + public TileEntity createNewTileEntity(@Nonnull World worldIn, int meta) { return new TileEntityGlowPanel(); } @@ -226,7 +233,8 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider { return true; } - + + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 9c1f83a07..05aa12ab1 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -61,6 +61,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -85,7 +86,8 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import buildcraft.api.tools.IToolWrench; + +import javax.annotation.Nonnull; /** * Block class for handling multiple machine block IDs. @@ -161,12 +163,14 @@ public abstract class BlockMachine extends BlockContainer public abstract MachineBlock getMachineBlock(); + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateMachine(this, getTypeProperty()); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -182,8 +186,9 @@ public abstract class BlockMachine extends BlockContainer return type.meta; } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); @@ -283,7 +288,7 @@ public abstract class BlockMachine extends BlockContainer } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); @@ -545,7 +550,7 @@ public abstract class BlockMachine extends BlockContainer { UUID owner = ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID(); - if(MekanismUtils.isOp((EntityPlayerMP)entityplayer) || owner == null || entityplayer.getUniqueID().equals(owner)) + if(MekanismUtils.isOp(entityplayer) || owner == null || entityplayer.getUniqueID().equals(owner)) { entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); } @@ -579,7 +584,7 @@ public abstract class BlockMachine extends BlockContainer } @Override - public TileEntity createTileEntity(World world, IBlockState state) + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { int metadata = state.getBlock().getMetaFromState(state); @@ -592,7 +597,7 @@ public abstract class BlockMachine extends BlockContainer } @Override - public TileEntity createNewTileEntity(World world, int metadata) + public TileEntity createNewTileEntity(@Nonnull World world, int metadata) { return null; } @@ -603,12 +608,14 @@ public abstract class BlockMachine extends BlockContainer return false; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { - return null; + return Items.AIR; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { @@ -616,6 +623,7 @@ public abstract class BlockMachine extends BlockContainer } @SideOnly(Side.CLIENT) + @Nonnull @Override public BlockRenderLayer getRenderLayer() { @@ -623,7 +631,7 @@ public abstract class BlockMachine extends BlockContainer } @Override - public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World world, BlockPos pos) + public float getPlayerRelativeBlockHardness(IBlockState state, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); @@ -644,7 +652,7 @@ public abstract class BlockMachine extends BlockContainer } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -845,8 +853,9 @@ public abstract class BlockMachine extends BlockContainer } } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); ItemStack itemStack = new ItemStack(this, 1, state.getBlock().getMetaFromState(state)); @@ -945,13 +954,10 @@ public abstract class BlockMachine extends BlockContainer { MachineType type = MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state)); - switch(type) - { - case LASER_AMPLIFIER: - return true; - default: - return false; + if (type == MachineType.LASER_AMPLIFIER) { + return true; } + return false; } public ItemStack dismantleBlock(IBlockState state, World world, BlockPos pos, boolean returnBlock) @@ -975,6 +981,7 @@ public abstract class BlockMachine extends BlockContainer return itemStack; } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { @@ -1014,7 +1021,7 @@ public abstract class BlockMachine extends BlockContainer } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { MachineType type = MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state)); @@ -1036,7 +1043,7 @@ public abstract class BlockMachine extends BlockContainer } @Override - public EnumFacing[] getValidRotations(World world, BlockPos pos) + public EnumFacing[] getValidRotations(World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); EnumFacing[] valid = new EnumFacing[6]; @@ -1058,7 +1065,7 @@ public abstract class BlockMachine extends BlockContainer } @Override - public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) + public boolean rotateBlock(World world, @Nonnull BlockPos pos, @Nonnull EnumFacing axis) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index a2a83818a..ad1500cd9 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -17,6 +17,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockObsidianTNT extends Block { public BlockObsidianTNT() @@ -26,7 +28,7 @@ public class BlockObsidianTNT extends Block } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { super.breakBlock(world, pos, state); @@ -56,7 +58,7 @@ public class BlockObsidianTNT extends Block } @Override - public void onBlockExploded(World world, BlockPos pos, Explosion explosion) + public void onBlockExploded(World world, @Nonnull BlockPos pos, @Nonnull Explosion explosion) { if(!world.isRemote) { diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index efb90bf2a..93d129d15 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -11,6 +11,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; + /** * Block class for handling multiple ore block IDs. * 0: Osmium Ore @@ -29,12 +31,14 @@ public class BlockOre extends Block setCreativeTab(Mekanism.tabMekanism); } + @Nonnull @Override protected BlockStateContainer createBlockState() { return new BlockStateOre(this); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 66029f299..2fa30c081 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -17,6 +17,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockPlastic extends Block { public PlasticBlockType type; @@ -35,12 +37,14 @@ public class BlockPlastic extends Block } } + @Nonnull @Override protected BlockStateContainer createBlockState() { return new BlockStatePlastic(this); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index 754b2147a..3a8a8f874 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -5,7 +5,6 @@ import mekanism.api.EnumColor; import mekanism.common.Mekanism; import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -16,6 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; + public class BlockPlasticFence extends BlockFence { public BlockPlasticFence() @@ -23,13 +24,15 @@ public class BlockPlasticFence extends BlockFence super(Material.CLAY, Material.CLAY.getMaterialMapColor()); setCreativeTab(Mekanism.tabMekanism); } - + + @Nonnull @Override protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] {NORTH, EAST, WEST, SOUTH, colorProperty}); + return new BlockStateContainer(this, NORTH, EAST, WEST, SOUTH, colorProperty); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -59,8 +62,9 @@ public class BlockPlasticFence extends BlockFence public static class PlasticFenceStateMapper extends StateMapperBase { + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { String properties = "east=" + state.getValue(EAST) + ","; properties += "north=" + state.getValue(NORTH) + ","; diff --git a/src/main/java/mekanism/common/block/BlockSalt.java b/src/main/java/mekanism/common/block/BlockSalt.java index b031b617f..01c977b8e 100644 --- a/src/main/java/mekanism/common/block/BlockSalt.java +++ b/src/main/java/mekanism/common/block/BlockSalt.java @@ -10,6 +10,8 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; +import javax.annotation.Nonnull; + public class BlockSalt extends Block { public BlockSalt() @@ -20,6 +22,7 @@ public class BlockSalt extends Block setSoundType(SoundType.SAND); } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java index da1ca895f..18bc7b663 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -1,9 +1,10 @@ package mekanism.common.block; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Random; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import mekanism.api.IMekWrench; @@ -96,9 +97,10 @@ public class BlockTransmitter extends Block implements ITileEntityProvider setHardness(1F); setResistance(10F); } - + + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntitySidedPipe tile = getTileEntitySidedPipe(worldIn, pos); if(tile != null) @@ -108,7 +110,8 @@ public class BlockTransmitter extends Block implements ITileEntityProvider return state; } - + + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -122,7 +125,8 @@ public class BlockTransmitter extends Block implements ITileEntityProvider TransmitterType type = state.getValue(BlockStateTransmitter.typeProperty); return type.ordinal(); } - + + @Nonnull @Override public BlockStateContainer createBlockState() { @@ -130,8 +134,9 @@ public class BlockTransmitter extends Block implements ITileEntityProvider } @SideOnly(Side.CLIENT) + @Nonnull @Override - public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos) + public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess w, BlockPos pos) { TileEntitySidedPipe tile = getTileEntitySidedPipe(w, pos); @@ -144,10 +149,11 @@ public class BlockTransmitter extends Block implements ITileEntityProvider ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL}; PropertyConnection connectionProp = new PropertyConnection((byte)0, (byte)0, typeArray, true); - return ((IExtendedBlockState)state).withProperty(OBJProperty.INSTANCE, new OBJState(Arrays.asList(), true)).withProperty(PropertyConnection.INSTANCE, connectionProp); + return ((IExtendedBlockState)state).withProperty(OBJProperty.INSTANCE, new OBJState(Collections.emptyList(), true)).withProperty(PropertyConnection.INSTANCE, connectionProp); } } - + + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { @@ -162,7 +168,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider } @Override - public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean b) + public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List collidingBoxes, @Nullable Entity entityIn, boolean b) { TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); @@ -176,15 +182,16 @@ public class BlockTransmitter extends Block implements ITileEntityProvider } } } - + + @Nonnull @Override - public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos) + public AxisAlignedBB getSelectedBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return getDefaultForTile(getTileEntitySidedPipe(world, pos)).offset(pos); } @Override - public RayTraceResult collisionRayTrace(IBlockState blockState, World world, BlockPos pos, Vec3d start, Vec3d end) + public RayTraceResult collisionRayTrace(IBlockState blockState, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Vec3d start, @Nonnull Vec3d end) { TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); @@ -231,9 +238,10 @@ public class BlockTransmitter extends Block implements ITileEntityProvider return false; } - + + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { ItemStack itemStack = ItemStack.EMPTY; TileEntitySidedPipe tileEntity = getTileEntitySidedPipe(world, pos); @@ -339,7 +347,8 @@ public class BlockTransmitter extends Block implements ITileEntityProvider return layer == BlockRenderLayer.CUTOUT; } - + + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { @@ -377,7 +386,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -425,7 +434,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider } @Override - public TileEntity createNewTileEntity(World worldIn, int meta) + public TileEntity createNewTileEntity(@Nonnull World worldIn, int meta) { TransmitterType type = TransmitterType.get(meta); diff --git a/src/main/java/mekanism/common/block/property/PropertyConnection.java b/src/main/java/mekanism/common/block/property/PropertyConnection.java index ace5440b7..5a1b8096a 100644 --- a/src/main/java/mekanism/common/block/property/PropertyConnection.java +++ b/src/main/java/mekanism/common/block/property/PropertyConnection.java @@ -45,7 +45,7 @@ public class PropertyConnection implements IUnlistedProperty @Override public String valueToString(PropertyConnection value) { - return Byte.toString(value.connectionByte) + "_" + Byte.toString(value.transmitterConnections) + "_" + return value.connectionByte + "_" + value.transmitterConnections + "_" + Arrays.toString(value.connectionTypes) + "_" + value.renderCenter; } } diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index 40f674a13..6e9e934c1 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -40,6 +40,7 @@ import net.minecraftforge.common.property.IUnlistedProperty; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Locale; @@ -86,31 +87,31 @@ public class BlockStateBasic extends ExtendedBlockState public enum BasicBlockType implements IStringSerializable { - OSMIUM_BLOCK(BasicBlock.BASIC_BLOCK_1, 0, "OsmiumBlock", null, false, Predicates.alwaysFalse(), false, false, true), - BRONZE_BLOCK(BasicBlock.BASIC_BLOCK_1, 1, "BronzeBlock", null, false, Predicates.alwaysFalse(), false, false, true), - REFINED_OBSIDIAN(BasicBlock.BASIC_BLOCK_1, 2, "RefinedObsidian", null, false, Predicates.alwaysFalse(), false, false, true), - COAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, "CharcoalBlock", null, false, Predicates.alwaysFalse(), false, false, false), - REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false, false, true), - STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false, false, true), + OSMIUM_BLOCK(BasicBlock.BASIC_BLOCK_1, 0, "OsmiumBlock", null, false, Predicates.alwaysFalse(), false, false, true), + BRONZE_BLOCK(BasicBlock.BASIC_BLOCK_1, 1, "BronzeBlock", null, false, Predicates.alwaysFalse(), false, false, true), + REFINED_OBSIDIAN(BasicBlock.BASIC_BLOCK_1, 2, "RefinedObsidian", null, false, Predicates.alwaysFalse(), false, false, true), + COAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, "CharcoalBlock", null, false, Predicates.alwaysFalse(), false, false, false), + REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false, false, true), + STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false, false, true), BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, true, Plane.HORIZONTAL, true, true, false), - TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, true, Predicates.alwaysFalse(), false, false, false), - STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, true, Predicates.alwaysFalse(), false, false, false), - DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, true, Predicates.alwaysFalse(), false, false, false), - STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, true, Predicates.alwaysFalse(), false, false, false), - DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, true, Predicates.alwaysFalse(), false, false, false), - COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false, false, true), - TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false, false, true), + TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, true, Predicates.alwaysFalse(), false, false, false), + STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, true, Predicates.alwaysFalse(), false, false, false), + DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, true, Predicates.alwaysFalse(), false, false, false), + STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, true, Predicates.alwaysFalse(), false, false, false), + DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, true, Predicates.alwaysFalse(), false, false, false), + COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false, false, true), + TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false, false, true), THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, true, Plane.HORIZONTAL, true, false, false), - THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, true, Predicates.alwaysFalse(), false, false, false), - THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, true, Predicates.alwaysFalse(), false, false, false), - INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, true, Predicates.alwaysFalse(), false, false, false), - INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true, Predicates.alwaysFalse(), true, false, false), - INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, true, Predicates.alwaysFalse(), false, true, false), - INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, true, Predicates.alwaysFalse(), false, true, false), - SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false, false, false), - PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser",TileEntityPressureDisperser.class, true, Predicates.alwaysFalse(), false, false, false), - BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false, false, false), - BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false, false, false), + THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, true, Predicates.alwaysFalse(), false, false, false), + THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, true, Predicates.alwaysFalse(), false, false, false), + INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, true, Predicates.alwaysFalse(), false, false, false), + INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true, Predicates.alwaysFalse(), true, false, false), + INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, true, Predicates.alwaysFalse(), false, true, false), + INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, true, Predicates.alwaysFalse(), false, true, false), + SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false, false, false), + PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser",TileEntityPressureDisperser.class, true, Predicates.alwaysFalse(), false, false, false), + BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false, false, false), + BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false, false, false), SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true, Plane.HORIZONTAL, false, false, false); public BasicBlock blockType; @@ -253,8 +254,9 @@ public class BlockStateBasic extends ExtendedBlockState public static class BasicBlockStateMapper extends StateMapperBase { + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { BlockBasic block = (BlockBasic)state.getBlock(); BasicBlockType type = state.getValue(block.getTypeProperty()); diff --git a/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java b/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java index 5a447b8c2..17d881b7c 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java +++ b/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java @@ -8,6 +8,8 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; + public class BlockStateCardboardBox extends BlockStateContainer { public static PropertyBool storageProperty = PropertyBool.create("storage"); @@ -19,8 +21,9 @@ public class BlockStateCardboardBox extends BlockStateContainer public static class CardboardBoxStateMapper extends StateMapperBase { + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { String property = "storage=" + state.getValue(storageProperty); diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index fed46113f..063ce361e 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -72,6 +72,8 @@ import net.minecraftforge.common.property.IUnlistedProperty; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import javax.annotation.Nonnull; + public class BlockStateMachine extends ExtendedBlockState { public static final PropertyBool activeProperty = PropertyBool.create("active"); @@ -410,8 +412,9 @@ public class BlockStateMachine extends ExtendedBlockState public static class MachineBlockStateMapper extends StateMapperBase { + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { BlockMachine block = (BlockMachine)state.getBlock(); MachineType type = state.getValue(block.getTypeProperty()); diff --git a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java index d7d5db83a..c94de540a 100644 --- a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java +++ b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java @@ -10,6 +10,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; import java.util.Locale; public class BlockStatePlastic extends BlockStateContainer @@ -38,8 +39,9 @@ public class BlockStatePlastic extends BlockStateContainer public static class PlasticBlockStateMapper extends StateMapperBase { + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { PlasticBlockType type = ((BlockPlastic)state.getBlock()).type; String property = "type=" + type.getName(); diff --git a/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java b/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java index d2cd97ca6..d402a90e5 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java +++ b/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java @@ -16,6 +16,7 @@ import net.minecraftforge.client.model.obj.OBJModel.OBJProperty; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import javax.annotation.Nonnull; import java.util.Locale; public class BlockStateTransmitter extends ExtendedBlockState @@ -105,8 +106,9 @@ public class BlockStateTransmitter extends ExtendedBlockState public static class TransmitterStateMapper extends StateMapperBase { + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { BlockTransmitter block = (BlockTransmitter)state.getBlock(); TransmitterType type = state.getValue(typeProperty); diff --git a/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java index 3fec15030..a12af8fff 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java +++ b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java @@ -10,7 +10,7 @@ import net.minecraftforge.common.capabilities.CapabilityManager; public class DefaultTileNetwork implements ITileNetwork { @Override - public void handlePacketData(ByteBuf dataStream) throws Exception {} + public void handlePacketData(ByteBuf dataStream) {} @Override public TileNetworkList getNetworkedData(TileNetworkList data) diff --git a/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java b/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java index 52dff71f1..221a87cc1 100644 --- a/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java +++ b/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java @@ -8,6 +8,8 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; +import javax.annotation.Nonnull; + public class ItemCapabilityWrapper implements ICapabilityProvider { private List capabilities = new ArrayList<>(); @@ -26,7 +28,7 @@ public class ItemCapabilityWrapper implements ICapabilityProvider } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { for(ItemCapability cap : capabilities) { @@ -40,7 +42,7 @@ public class ItemCapabilityWrapper implements ICapabilityProvider } @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { for(ItemCapability cap : capabilities) { diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index da88c0f8d..19a826401 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -18,7 +18,7 @@ public class RecipeFormula public NonNullList input = NonNullList.withSize(9, ItemStack.EMPTY); - public IRecipe recipe = null; + public IRecipe recipe; public RecipeFormula(World world, NonNullList inv) { diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index d8ca40dff..6917500d7 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -75,7 +75,7 @@ public class SynchronizedBoilerData extends SynchronizedData= 0 && slotID < 1) diff --git a/src/main/java/mekanism/common/content/matrix/MatrixCache.java b/src/main/java/mekanism/common/content/matrix/MatrixCache.java index aedb1fdd7..02ac2c91c 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixCache.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixCache.java @@ -32,7 +32,7 @@ public class MatrixCache extends MultiblockCache for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) { - NBTTagCompound tagCompound = (NBTTagCompound)tagList.getCompoundTagAt(tagCount); + NBTTagCompound tagCompound = tagList.getCompoundTagAt(tagCount); byte slotID = tagCompound.getByte("Slot"); if(slotID >= 0 && slotID < 2) diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index 4514859c4..5b2bd3ad2 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -36,7 +36,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol { TileEntity tile = new Coord4D(x, y, z, pointer.getWorld().provider.getDimension()).getTileEntity(pointer.getWorld()); - if(tile != null && (tile instanceof TileEntityInductionCell || tile instanceof TileEntityInductionProvider)) + if(tile instanceof TileEntityInductionCell || tile instanceof TileEntityInductionProvider) { return true; } diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index 9aad2f8ac..11d8547aa 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -2,8 +2,6 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.base.TileNetworkList; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java index a7e3ab7b6..602ce2ba7 100644 --- a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java @@ -118,7 +118,7 @@ public class ThreadMinerSearch extends Thread acceptedItems.put(info, filterFound); } - canFilter = tileEntity.inverse ? filterFound == null : filterFound != null; + canFilter = tileEntity.inverse == (filterFound == null); if(canFilter) { @@ -128,7 +128,7 @@ public class ThreadMinerSearch extends Thread found++; } } - } catch(Exception e) {} + } catch(Exception ignored) {} } state = State.FINISHED; diff --git a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java index 989763384..29795fcf3 100644 --- a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java +++ b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java @@ -32,7 +32,7 @@ public class SynchronizedTankData extends SynchronizedData return true; } - if(fluidStored != null && prevFluid != null) + if(fluidStored != null) { int totalStage = (volHeight - 2) * (TankUpdateProtocol.FLUID_PER_TANK / 100); int currentStage = (int)((fluidStored.amount / (float)(volume*TankUpdateProtocol.FLUID_PER_TANK)) * totalStage); diff --git a/src/main/java/mekanism/common/content/tank/TankCache.java b/src/main/java/mekanism/common/content/tank/TankCache.java index a8c3d52d9..a4010b807 100644 --- a/src/main/java/mekanism/common/content/tank/TankCache.java +++ b/src/main/java/mekanism/common/content/tank/TankCache.java @@ -44,7 +44,7 @@ public class TankCache extends MultiblockCache for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) { - NBTTagCompound tagCompound = (NBTTagCompound)tagList.getCompoundTagAt(tagCount); + NBTTagCompound tagCompound = tagList.getCompoundTagAt(tagCount); byte slotID = tagCompound.getByte("Slot"); if(slotID >= 0 && slotID < 2) diff --git a/src/main/java/mekanism/common/content/transporter/StackSearcher.java b/src/main/java/mekanism/common/content/transporter/StackSearcher.java index 64c92563e..1b43bcfcd 100644 --- a/src/main/java/mekanism/common/content/transporter/StackSearcher.java +++ b/src/main/java/mekanism/common/content/transporter/StackSearcher.java @@ -24,12 +24,9 @@ public class StackSearcher if(tile instanceof ISidedInventory) { slots = ((ISidedInventory)tile).getSlotsForFace(side.getOpposite()); - - if(slots != null) - { - i = slots.length; - } - } + + i = slots.length; + } else if(tile instanceof IInventory) { i = ((IInventory)tile).getSizeInventory(); @@ -56,7 +53,7 @@ public class StackSearcher { ItemStack toSend = inventory.getStackInSlot(slotID); - if(((ISidedInventory)inventory).canExtractItem(slotID, toSend, side.getOpposite())) + if(inventory.canExtractItem(slotID, toSend, side.getOpposite())) { return new InvStack(tileEntity, slotID, toSend, side.getOpposite()); } @@ -104,7 +101,7 @@ public class StackSearcher ISidedInventory sidedInventory = (ISidedInventory)tileEntity; int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - if(slots != null && slots.length != 0) + if(slots.length != 0) { for(i = i - 1; i >= 0; i--) { @@ -200,7 +197,7 @@ public class StackSearcher } } - if(ret != null && !ret.getStack().isEmpty() && ret.getStack().getCount() >= min) + if(!ret.getStack().isEmpty() && ret.getStack().getCount() >= min) { return ret; } diff --git a/src/main/java/mekanism/common/content/transporter/TransitRequest.java b/src/main/java/mekanism/common/content/transporter/TransitRequest.java index 85cf13e77..34da04ad2 100644 --- a/src/main/java/mekanism/common/content/transporter/TransitRequest.java +++ b/src/main/java/mekanism/common/content/transporter/TransitRequest.java @@ -71,21 +71,18 @@ public class TransitRequest ISidedInventory sidedInventory = (ISidedInventory)tile; int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - if(slots != null) + for(int get = slots.length - 1; get >= 0; get--) { - for(int get = slots.length - 1; get >= 0; get--) + int slotID = slots[get]; + + if(!sidedInventory.getStackInSlot(slotID).isEmpty() && sidedInventory.getStackInSlot(slotID).getCount() > 0) { - int slotID = slots[get]; + ItemStack toSend = sidedInventory.getStackInSlot(slotID).copy(); + toSend.setCount(Math.min(amount, toSend.getCount())); - if(!sidedInventory.getStackInSlot(slotID).isEmpty() && sidedInventory.getStackInSlot(slotID).getCount() > 0) + if(!ret.hasType(toSend) && sidedInventory.canExtractItem(slotID, toSend, side.getOpposite()) && finder.modifies(toSend)) { - ItemStack toSend = sidedInventory.getStackInSlot(slotID).copy(); - toSend.setCount(Math.min(amount, toSend.getCount())); - - if(!ret.hasType(toSend) && sidedInventory.canExtractItem(slotID, toSend, side.getOpposite()) && finder.modifies(toSend)) - { - ret.setItem(toSend, slotID); - } + ret.setItem(toSend, slotID); } } } @@ -131,7 +128,7 @@ public class TransitRequest public static final TransitResponse EMPTY = new TransitResponse(-1, ItemStack.EMPTY); public int slotID; - public ItemStack stack = ItemStack.EMPTY; + public ItemStack stack; public TransitResponse(int s, ItemStack i) { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index 813733bfd..a8b679407 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -2,7 +2,6 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index ece317cf1..545715de4 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -104,7 +104,7 @@ public class TransporterManager ISidedInventory sidedInventory = (ISidedInventory)inv; int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - if(slots == null || slots.length == 0) + if(slots.length == 0) { return null; } @@ -159,7 +159,7 @@ public class TransporterManager ISidedInventory sidedInventory = (ISidedInventory)tile; int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - if(slots != null && slots.length != 0) + if(slots.length != 0) { if(stack.pathType != Path.HOME && sidedInventory instanceof TileEntityBin && side.getOpposite() == EnumFacing.DOWN) { @@ -449,7 +449,7 @@ public class TransporterManager ISidedInventory sidedInventory = (ISidedInventory)tileEntity; int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - if(slots != null && slots.length != 0) + if(slots.length != 0) { if(tileEntity instanceof TileEntityBin) { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 08c3f0c39..0bd2a8979 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -27,6 +27,8 @@ import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; + public final class TransporterPathfinder { public static class IdlePath @@ -214,7 +216,7 @@ public final class TransporterPathfinder } @Override - public int compareTo(Destination dest) + public int compareTo(@Nonnull Destination dest) { if(score < dest.score) { @@ -338,8 +340,7 @@ public final class TransporterPathfinder } } - List dests = new ArrayList<>(); - dests.addAll(destPaths.values()); + List dests = new ArrayList<>(destPaths.values()); Collections.sort(dests); diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 1393ba4c4..f49b3225f 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -303,7 +303,7 @@ public class TransporterStack return getNext(transporter).sideDifference(transporter.coord()); } } - else if(progress > 50) + else { if(getNext(transporter) != null) { diff --git a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java index 99c9efac8..f204658e8 100644 --- a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java +++ b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java @@ -17,7 +17,7 @@ public class EntityBabySkeleton extends EntitySkeleton private static final UUID babySpeedBoostUUID = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836"); private static final AttributeModifier babySpeedBoostModifier = new AttributeModifier(babySpeedBoostUUID, "Baby speed boost", 0.5D, 1); - private static final DataParameter IS_CHILD = EntityDataManager.createKey(EntityBabySkeleton.class, DataSerializers.BOOLEAN); + private static final DataParameter IS_CHILD = EntityDataManager.createKey(EntityBabySkeleton.class, DataSerializers.BOOLEAN); public EntityBabySkeleton(World world) { diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 84a74d93f..7e1246c5f 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -26,6 +26,8 @@ import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { public EnumColor color = EnumColor.DARK_BLUE; @@ -38,11 +40,11 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData public UUID cachedEntityUUID; - private static final DataParameter IS_LATCHED = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.BYTE); - private static final DataParameter LATCHED_X = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); - private static final DataParameter LATCHED_Y = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); - private static final DataParameter LATCHED_Z = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); - private static final DataParameter LATCHED_ID = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); + private static final DataParameter IS_LATCHED = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.BYTE); + private static final DataParameter LATCHED_X = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); + private static final DataParameter LATCHED_Y = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); + private static final DataParameter LATCHED_Z = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); + private static final DataParameter LATCHED_ID = EntityDataManager.createKey(EntityBalloon.class, DataSerializers.VARINT); public EntityBalloon(World world) { @@ -127,7 +129,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { if(dataManager.get(IS_LATCHED) == 1) { - latched = new Coord4D((int)dataManager.get(LATCHED_X), (int)dataManager.get(LATCHED_Y), (int)dataManager.get(LATCHED_Z), world.provider.getDimension()); + latched = new Coord4D(dataManager.get(LATCHED_X), dataManager.get(LATCHED_Y), dataManager.get(LATCHED_Z), world.provider.getDimension()); } else { latched = null; @@ -282,7 +284,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { try { doParticle(); - } catch(Throwable t) {} + } catch(Throwable ignored) {} } } @@ -322,7 +324,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData protected void entityInit() {} @Override - protected void readEntityFromNBT(NBTTagCompound nbtTags) + protected void readEntityFromNBT(@Nonnull NBTTagCompound nbtTags) { color = EnumColor.values()[nbtTags.getInteger("color")]; @@ -339,7 +341,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData } @Override - protected void writeEntityToNBT(NBTTagCompound nbtTags) + protected void writeEntityToNBT(@Nonnull NBTTagCompound nbtTags) { nbtTags.setInteger("color", color.ordinal()); @@ -433,7 +435,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData } @Override - public boolean attackEntityFrom(DamageSource dmgSource, float damage) + public boolean attackEntityFrom(@Nonnull DamageSource dmgSource, float damage) { if(isEntityInvulnerable(dmgSource)) { diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index d160f7c3e..357adb12c 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -30,6 +30,8 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; +import javax.annotation.Nonnull; + public class EntityFlame extends Entity implements IEntityAdditionalSpawnData { public static final int LIFESPAN = 80; @@ -246,7 +248,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData return false; } - if(!result.isEmpty() && result.getItem() != null) + if(!result.isEmpty()) { if(!world.isRemote) { @@ -254,25 +256,25 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData Block b = state.getBlock(); Block newBlock = Block.getBlockFromItem(result.getItem()); - if(newBlock != null && newBlock != Blocks.AIR) + if(newBlock != Blocks.AIR) { world.setBlockState(block.getPos(), Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 3); } else { world.setBlockToAir(block.getPos()); - + EntityItem item = new EntityItem(world, block.x + 0.5, block.y + 0.5, block.z + 0.5, result.copy()); item.motionX = 0; item.motionY = 0; item.motionZ = 0; world.spawnEntity(item); } - + world.playEvent(null, 2001, block.getPos(), Block.getStateId(state)); } - + spawnParticlesAt(new Pos3D(block).translate(0.5, 0.5, 0.5)); - + return true; } @@ -308,13 +310,13 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData protected void entityInit() {} @Override - protected void readEntityFromNBT(NBTTagCompound nbtTags) + protected void readEntityFromNBT(@Nonnull NBTTagCompound nbtTags) { mode = ItemFlamethrower.FlamethrowerMode.values()[nbtTags.getInteger("mode")]; } @Override - protected void writeEntityToNBT(NBTTagCompound nbtTags) + protected void writeEntityToNBT(@Nonnull NBTTagCompound nbtTags) { nbtTags.setInteger("mode", mode.ordinal()); } diff --git a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java index 1595bca3a..0230d415f 100644 --- a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java +++ b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java @@ -7,6 +7,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class EntityObsidianTNT extends Entity { /** How long the fuse is */ @@ -114,13 +116,13 @@ public class EntityObsidianTNT extends Entity } @Override - protected void writeEntityToNBT(NBTTagCompound nbtTags) + protected void writeEntityToNBT(@Nonnull NBTTagCompound nbtTags) { nbtTags.setByte("Fuse", (byte)fuse); } @Override - protected void readEntityFromNBT(NBTTagCompound nbtTags) + protected void readEntityFromNBT(@Nonnull NBTTagCompound nbtTags) { fuse = nbtTags.getByte("Fuse"); } diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 9652f5d83..bf0fa03c6 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -61,6 +61,8 @@ import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; +import javax.annotation.Nonnull; + @Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = MekanismHooks.GALACTICRAFT_MOD_ID) public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable { @@ -76,11 +78,11 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public boolean texTick; - private static final DataParameter ELECTRICITY = EntityDataManager.createKey(EntityRobit.class, DataSerializers.FLOAT); - private static final DataParameter OWNER_UUID = EntityDataManager.createKey(EntityRobit.class, DataSerializers.STRING); - private static final DataParameter OWNER_NAME = EntityDataManager.createKey(EntityRobit.class, DataSerializers.STRING); - private static final DataParameter FOLLOW = EntityDataManager.createKey(EntityRobit.class, DataSerializers.BOOLEAN); - private static final DataParameter DROP_PICKUP = EntityDataManager.createKey(EntityRobit.class, DataSerializers.BOOLEAN); + private static final DataParameter ELECTRICITY = EntityDataManager.createKey(EntityRobit.class, DataSerializers.FLOAT); + private static final DataParameter OWNER_UUID = EntityDataManager.createKey(EntityRobit.class, DataSerializers.STRING); + private static final DataParameter OWNER_NAME = EntityDataManager.createKey(EntityRobit.class, DataSerializers.STRING); + private static final DataParameter FOLLOW = EntityDataManager.createKey(EntityRobit.class, DataSerializers.BOOLEAN); + private static final DataParameter DROP_PICKUP = EntityDataManager.createKey(EntityRobit.class, DataSerializers.BOOLEAN); public EntityRobit(World world) { @@ -110,6 +112,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine prevPosZ = z; } + @Nonnull @Override public PathNavigateGround getNavigator() { @@ -206,7 +209,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { ITeslaProducer producer = stack.getCapability(Capabilities.TESLA_PRODUCER_CAPABILITY, null); - long needed = (long)Math.round((MAX_ELECTRICITY-getEnergy())*general.TO_TESLA); + long needed = Math.round((MAX_ELECTRICITY-getEnergy())*general.TO_TESLA); setEnergy(getEnergy() + producer.takePower(needed, false)*general.FROM_TESLA); } else if(MekanismUtils.useForge() && stack.hasCapability(CapabilityEnergy.ENERGY, null)) @@ -289,7 +292,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { List items = world.getEntitiesWithinAABB(EntityItem.class, getEntityBoundingBox().grow(1.5, 1.5, 1.5)); - if(items != null && !items.isEmpty()) + if(!items.isEmpty()) { for(EntityItem item : items) { @@ -399,6 +402,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine return false; } + @Nonnull @Override public EnumActionResult applyPlayerInteraction(EntityPlayer entityplayer, Vec3d vec, EnumHand hand) { @@ -519,7 +523,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine } @Override - protected void damageEntity(DamageSource damageSource, float amount) + protected void damageEntity(@Nonnull DamageSource damageSource, float amount) { amount = ForgeHooks.onLivingHurt(this, damageSource, amount); @@ -552,7 +556,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public double getEnergy() { - return (float)dataManager.get(ELECTRICITY); + return dataManager.get(ELECTRICITY); } public void setEnergy(double energy) @@ -607,18 +611,21 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine return inventory.size(); } + @Nonnull @Override public ItemStack getStackInSlot(int slotID) { return inventory.get(slotID); } + @Nonnull @Override public ItemStack decrStackSize(int slotID, int amount) { return ItemStackHelper.getAndSplit(inventory, slotID, amount); } + @Nonnull @Override public ItemStack removeStackFromSlot(int slotID) { @@ -626,7 +633,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine } @Override - public void setInventorySlotContents(int slotID, ItemStack itemstack) + public void setInventorySlotContents(int slotID, @Nonnull ItemStack itemstack) { inventory.set(slotID, itemstack); @@ -646,19 +653,19 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public void markDirty() {} @Override - public boolean isUsableByPlayer(EntityPlayer entityplayer) + public boolean isUsableByPlayer(@Nonnull EntityPlayer entityplayer) { return true; } @Override - public void openInventory(EntityPlayer player) {} + public void openInventory(@Nonnull EntityPlayer player) {} @Override - public void closeInventory(EntityPlayer player) {} + public void closeInventory(@Nonnull EntityPlayer player) {} @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) + public boolean isItemValidForSlot(int i, @Nonnull ItemStack itemstack) { return true; } @@ -693,7 +700,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine for(int slots = 0; slots < nbtTags.tagCount(); slots++) { - NBTTagCompound tagCompound = (NBTTagCompound)nbtTags.getCompoundTagAt(slots); + NBTTagCompound tagCompound = nbtTags.getCompoundTagAt(slots); byte slotID = tagCompound.getByte("Slot"); if(slotID >= 0 && slotID < inventory.size()) diff --git a/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java b/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java index eea8b52ab..b73b1148e 100644 --- a/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java +++ b/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java @@ -152,6 +152,6 @@ public class RobitAIFollow extends EntityAIBase IBlockState iblockstate = world.getBlockState(pos); Block block = iblockstate.getBlock(); - return block == Blocks.AIR ? true : !iblockstate.isFullCube(); + return block == Blocks.AIR || !iblockstate.isFullCube(); } } diff --git a/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java b/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java index affc6a30e..5518f85c2 100644 --- a/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java +++ b/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java @@ -166,6 +166,6 @@ public class RobitAIPickup extends EntityAIBase IBlockState iblockstate = world.getBlockState(pos); Block block = iblockstate.getBlock(); - return block == Blocks.AIR ? true : !iblockstate.isFullCube(); + return block == Blocks.AIR || !iblockstate.isFullCube(); } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index 96a54aede..256d40979 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -2,7 +2,6 @@ package mekanism.common.frequency; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.HashSet; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index c20603321..f80aedbab 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -3,7 +3,6 @@ package mekanism.common.frequency; import io.netty.buffer.ByteBuf; import java.lang.reflect.Constructor; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; @@ -20,6 +19,8 @@ import net.minecraft.world.World; import net.minecraft.world.storage.WorldSavedData; import net.minecraftforge.common.util.Constants.NBT; +import javax.annotation.Nonnull; + public class FrequencyManager { public static final int MAX_FREQ_LENGTH = 16; @@ -311,7 +312,7 @@ public class FrequencyManager } @Override - public void readFromNBT(NBTTagCompound nbtTags) + public void readFromNBT(@Nonnull NBTTagCompound nbtTags) { try { String frequencyClass = nbtTags.getString("frequencyClass"); @@ -329,7 +330,7 @@ public class FrequencyManager { NBTTagCompound compound = list.getCompoundTagAt(i); - Constructor c = Class.forName(frequencyClass).getConstructor(new Class[] {NBTTagCompound.class}); + Constructor c = Class.forName(frequencyClass).getConstructor(NBTTagCompound.class); Frequency freq = (Frequency)c.newInstance(compound); loadedFrequencies.add(freq); @@ -339,8 +340,9 @@ public class FrequencyManager } } + @Nonnull @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound nbtTags) { nbtTags.setString("frequencyClass", manager.frequencyClass.getName()); diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index da13eb45f..af1ee94b3 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -140,21 +140,21 @@ public final class MekanismHooks try { Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("oreOsmium"), null, false, new ItemStack(MekanismItems.Dust, 2, Resource.OSMIUM.ordinal())); - } catch(Exception e) {} + } catch(Exception ignored) {} try { Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotOsmium"), null, false, new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal())); Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotRefinedObsidian"), null, false, new ItemStack(MekanismItems.OtherDust, 1, 5)); Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotRefinedGlowstone"), null, false, new ItemStack(Items.GLOWSTONE_DUST)); Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotSteel"), null, false, new ItemStack(MekanismItems.OtherDust, 1, 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} try { for(Resource resource : Resource.values()) { Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("clump" + resource.getName()), null, false, new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal())); } - } catch(Exception e) {} + } catch(Exception ignored) {} } @Method(modid = COMPUTERCRAFT_MOD_ID) @@ -162,7 +162,7 @@ public final class MekanismHooks { try { ComputerCraftAPI.registerPeripheralProvider(new CCPeripheral.CCPeripheralProvider()); - } catch(Exception e) {} + } catch(Exception ignored) {} } @Method(modid = OPENCOMPUTERS_MOD_ID) @@ -170,7 +170,7 @@ public final class MekanismHooks { try { Driver.add(new OCDriver()); - } catch(Exception e) {} + } catch(Exception ignored) {} } public void addPulverizerRecipe(ItemStack input, ItemStack output, int energy) diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 001aab7df..7bf356311 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -29,6 +29,8 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nonnull; + public final class OreDictManager { private static final List minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium", "Platinum", "Iridium"); @@ -125,7 +127,7 @@ public final class OreDictManager { RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), new ItemStack(Blocks.COBBLESTONE), StackUtils.size(OreDictionary.getOres("ore" + resource.getName()).get(0), 1)); } - } catch(Exception e) {} + } catch(Exception ignored) {} } for(String s : minorCompat) @@ -134,21 +136,21 @@ public final class OreDictManager { try { RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dust" + s).get(0), 2)); - } catch(Exception e) {} + } catch(Exception ignored) {} } for(ItemStack ore : OreDictionary.getOres("ingot" + s)) { try { RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dust" + s).get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} } for(ItemStack ore : OreDictionary.getOres("dust" + s)) { try { RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), new ItemStack(Blocks.COBBLESTONE), StackUtils.size(OreDictionary.getOres("ore" + s).get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} } } @@ -156,21 +158,21 @@ public final class OreDictManager { try { RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dustYellorium").get(0), 2)); - } catch(Exception e) {} + } catch(Exception ignored) {} } for(ItemStack ore : OreDictionary.getOres("gemQuartz")) { try { RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dustNetherQuartz").get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} } for(ItemStack ore : OreDictionary.getOres("dustNetherQuartz")) { try { RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("gemQuartz").get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} } for(ItemStack ore : OreDictionary.getOres("oreQuartz")) @@ -210,33 +212,33 @@ public final class OreDictManager { addIC2BronzeRecipe(); } - } catch(Exception e) {} + } catch(Exception ignored) {} try { FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.SILVER.ordinal()), StackUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); - } catch(Exception e) {} + } catch(Exception ignored) {} try { FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.LEAD.ordinal()), StackUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); - } catch(Exception e) {} + } catch(Exception ignored) {} try { RecipeHandler.addCrusherRecipe(new ItemStack(Items.COAL), StackUtils.size(OreDictionary.getOres("dustCoal").get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} try { RecipeHandler.addCrusherRecipe(new ItemStack(Items.COAL, 1, 1), StackUtils.size(OreDictionary.getOres("dustCharcoal").get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} try { RecipeHandler.addCrusherRecipe(new ItemStack(Items.GUNPOWDER), StackUtils.size(OreDictionary.getOres("dustSaltpeter").get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} for(ItemStack ore : OreDictionary.getOres("sand")) { try { RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("itemSilicon").get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} } for(ItemStack ore : OreDictionary.getOres("dustSaltpeter")) @@ -285,7 +287,7 @@ public final class OreDictManager RecipeHandler.addCrusherRecipe(new ItemStack(ore.getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(MekanismItems.BioFuel, 2)); } } - } catch(Exception e) {} + } catch(Exception ignored) {} } @Method(modid = MekanismHooks.IC2_MOD_ID) @@ -293,7 +295,7 @@ public final class OreDictManager { try { Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotBronze"), null, false, StackUtils.size(OreDictionary.getOres("dustBronze").get(0), 1)); - } catch(Exception e) {} + } catch(Exception ignored) {} } @@ -304,7 +306,7 @@ public final class OreDictManager { Container tempContainer = new Container() { @Override - public boolean canInteractWith(EntityPlayer player) + public boolean canInteractWith(@Nonnull EntityPlayer player) { return false; } diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index 53b2c777e..0abbfce3d 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -27,6 +27,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.Method; +import javax.annotation.Nonnull; + @Interface(iface = "mcp.mobius.waila.api.IWailaDataProvider", modid = MekanismHooks.WAILA_MOD_ID) public class WailaDataProvider implements IWailaDataProvider { @@ -45,7 +47,8 @@ public class WailaDataProvider implements IWailaDataProvider registrar.registerHeadProvider(provider, TileEntityBin.class); registrar.registerHeadProvider(provider, TileEntityEnergyCube.class); } - + + @Nonnull @Override @Method(modid = MekanismHooks.WAILA_MOD_ID) public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) @@ -53,6 +56,7 @@ public class WailaDataProvider implements IWailaDataProvider return ItemStack.EMPTY; } + @Nonnull @Override @Method(modid = MekanismHooks.WAILA_MOD_ID) public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) @@ -101,6 +105,7 @@ public class WailaDataProvider implements IWailaDataProvider return currenttip; } + @Nonnull @Override @Method(modid = MekanismHooks.WAILA_MOD_ID) public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) @@ -108,6 +113,7 @@ public class WailaDataProvider implements IWailaDataProvider return currenttip; } + @Nonnull @Override @Method(modid = MekanismHooks.WAILA_MOD_ID) public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) @@ -115,6 +121,7 @@ public class WailaDataProvider implements IWailaDataProvider return currenttip; } + @Nonnull @Override @Method(modid = MekanismHooks.WAILA_MOD_ID) public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) diff --git a/src/main/java/mekanism/common/integration/computer/CCPeripheral.java b/src/main/java/mekanism/common/integration/computer/CCPeripheral.java index 09f340c2d..6f4d804f2 100644 --- a/src/main/java/mekanism/common/integration/computer/CCPeripheral.java +++ b/src/main/java/mekanism/common/integration/computer/CCPeripheral.java @@ -7,11 +7,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import dan200.computercraft.api.lua.ILuaContext; -import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheralProvider; +import javax.annotation.Nonnull; + /** * Created by aidancbrady on 7/20/15. */ @@ -25,6 +26,7 @@ public class CCPeripheral implements IPeripheral computerTile = tile; } + @Nonnull @Override @Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID) public String getType() @@ -32,6 +34,7 @@ public class CCPeripheral implements IPeripheral return computerTile.getName(); } + @Nonnull @Override @Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID) public String[] getMethodNames() @@ -41,8 +44,7 @@ public class CCPeripheral implements IPeripheral @Override @Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID) - 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) { try { return computerTile.invoke(method, arguments); } catch(NoSuchMethodException e) { @@ -55,11 +57,11 @@ public class CCPeripheral implements IPeripheral @Override @Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID) - public void attach(IComputerAccess computer) {} + public void attach(@Nonnull IComputerAccess computer) {} @Override @Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID) - public void detach(IComputerAccess computer) {} + public void detach(@Nonnull IComputerAccess computer) {} @Override @Optional.Method(modid = MekanismHooks.COMPUTERCRAFT_MOD_ID) @@ -71,11 +73,11 @@ public class CCPeripheral implements IPeripheral public static class CCPeripheralProvider implements IPeripheralProvider { @Override - public IPeripheral getPeripheral(World world, BlockPos pos, EnumFacing side) + public IPeripheral getPeripheral(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side) { TileEntity te = world.getTileEntity(pos); - if(te != null && te instanceof IComputerIntegration) + if(te instanceof IComputerIntegration) { return new CCPeripheral((IComputerIntegration)te); } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java index faa1c5499..31378c032 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java @@ -36,7 +36,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java index fe2455c12..e8fbe9330 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -1,6 +1,5 @@ package mekanism.common.integration.multipart; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Optional; diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java b/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java index 80bd7be00..d09ec64de 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java @@ -25,6 +25,6 @@ public class TeslaCableIntegration implements ITeslaConsumer @Method(modid = MekanismHooks.TESLA_MOD_ID) public long givePower(long power, boolean simulated) { - return (long)Math.round(tileEntity.acceptEnergy(side, power*general.FROM_TESLA, simulated)*general.TO_TESLA); + return Math.round(tileEntity.acceptEnergy(side, power*general.FROM_TESLA, simulated)*general.TO_TESLA); } } diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java b/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java index 73c872fcf..c6629857f 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java @@ -32,14 +32,14 @@ public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaPro @Method(modid = MekanismHooks.TESLA_MOD_ID) public long getStoredPower() { - return (long)Math.round(tileEntity.getEnergy()*general.TO_TESLA); + return Math.round(tileEntity.getEnergy()*general.TO_TESLA); } @Override @Method(modid = MekanismHooks.TESLA_MOD_ID) public long getCapacity() { - return (long)Math.round(tileEntity.getMaxEnergy()*general.TO_TESLA); + return Math.round(tileEntity.getMaxEnergy()*general.TO_TESLA); } @Override @@ -58,7 +58,7 @@ public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaPro public long rfToTesla(int rf) { - return (long)Math.round(rf*general.FROM_RF*general.TO_TESLA); + return Math.round(rf*general.FROM_RF*general.TO_TESLA); } public int teslaToRF(long tesla) diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java b/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java index 4d7607d02..d1484862e 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java @@ -77,13 +77,13 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT @Method(modid = MekanismHooks.TESLA_MOD_ID) public long getStoredPower() { - return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA); + return Math.round(getItem().getEnergy(getStack())*general.TO_TESLA); } @Override @Method(modid = MekanismHooks.TESLA_MOD_ID) public long getCapacity() { - return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA); + return Math.round(getItem().getEnergy(getStack())*general.TO_TESLA); } } diff --git a/src/main/java/mekanism/common/integration/wrenches/CofhProxy.java b/src/main/java/mekanism/common/integration/wrenches/CofhProxy.java index de5bb0eab..c3bdf7fdd 100644 --- a/src/main/java/mekanism/common/integration/wrenches/CofhProxy.java +++ b/src/main/java/mekanism/common/integration/wrenches/CofhProxy.java @@ -38,7 +38,7 @@ public class CofhProxy implements MekWrenchProxy, IMekWrench { if(wrench.getItem() instanceof IToolHammer) { - ((IToolHammer)wrench.getItem()).toolUsed(wrench, player, rayTrace.getBlockPos() != null ? rayTrace.getBlockPos() : BlockPos.ORIGIN); + ((IToolHammer)wrench.getItem()).toolUsed(wrench, player, rayTrace.getBlockPos()); } } } diff --git a/src/main/java/mekanism/common/integration/wrenches/IC2Proxy.java b/src/main/java/mekanism/common/integration/wrenches/IC2Proxy.java index 1a1f45b6d..9daada149 100644 --- a/src/main/java/mekanism/common/integration/wrenches/IC2Proxy.java +++ b/src/main/java/mekanism/common/integration/wrenches/IC2Proxy.java @@ -20,7 +20,7 @@ public class IC2Proxy implements MekWrenchProxy, IMekWrench try { w = Class.forName(IC2_WRENCH_CLASS); - } catch(ClassNotFoundException e) {} + } catch(ClassNotFoundException ignored) {} wrenchClass = w; } diff --git a/src/main/java/mekanism/common/inventory/InventoryList.java b/src/main/java/mekanism/common/inventory/InventoryList.java index 4ccec4d72..094c24c4b 100644 --- a/src/main/java/mekanism/common/inventory/InventoryList.java +++ b/src/main/java/mekanism/common/inventory/InventoryList.java @@ -10,6 +10,8 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; +import javax.annotation.Nonnull; + /*Copied & modified from net.minecraft.inventory.InventoryBasic */ public class InventoryList implements IInventory { @@ -29,14 +31,18 @@ public class InventoryList implements IInventory /** * Returns the stack in the given slot. */ + @Nonnull + @Override public ItemStack getStackInSlot(int index) { - return index >= 0 && index < this.inventoryContents.size() ? (ItemStack)this.inventoryContents.get(index) : ItemStack.EMPTY; + return index >= 0 && index < this.inventoryContents.size() ? this.inventoryContents.get(index) : ItemStack.EMPTY; } /** * Removes up to a specified number of items from an inventory slot and returns them in a new stack. */ + @Nonnull + @Override public ItemStack decrStackSize(int index, int count) { ItemStack itemstack = ItemStackHelper.getAndSplit(this.inventoryContents, index, count); @@ -52,9 +58,11 @@ public class InventoryList implements IInventory /** * Removes a stack from the given slot and returns it. */ + @Nonnull + @Override public ItemStack removeStackFromSlot(int index) { - ItemStack itemstack = (ItemStack)this.inventoryContents.get(index); + ItemStack itemstack = this.inventoryContents.get(index); if (itemstack.isEmpty()) { @@ -70,7 +78,7 @@ public class InventoryList implements IInventory /** * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). */ - public void setInventorySlotContents(int index, ItemStack stack) + public void setInventorySlotContents(int index, @Nonnull ItemStack stack) { this.inventoryContents.set(index, stack); @@ -106,6 +114,8 @@ public class InventoryList implements IInventory /** * Get the name of this object. For players this returns their username */ + @Nonnull + @Override public String getName() { return this.inventoryTitle; @@ -130,9 +140,11 @@ public class InventoryList implements IInventory /** * Get the formatted ChatComponent that will be used for the sender's username in chat */ + @Nonnull + @Override public ITextComponent getDisplayName() { - return (ITextComponent)(this.hasCustomName() ? new TextComponentString(this.getName()) : new TextComponentTranslation(this.getName(), new Object[0])); + return (this.hasCustomName() ? new TextComponentString(this.getName()) : new TextComponentTranslation(this.getName(), new Object[0])); } /** @@ -155,16 +167,16 @@ public class InventoryList implements IInventory /** * Don't rename this method to canInteractWith due to conflicts with Container */ - public boolean isUsableByPlayer(EntityPlayer player) + public boolean isUsableByPlayer(@Nonnull EntityPlayer player) { return true; } - public void openInventory(EntityPlayer player) + public void openInventory(@Nonnull EntityPlayer player) { } - public void closeInventory(EntityPlayer player) + public void closeInventory(@Nonnull EntityPlayer player) { } @@ -172,7 +184,7 @@ public class InventoryList implements IInventory * Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot. For * guis use Slot.isItemValid */ - public boolean isItemValidForSlot(int index, ItemStack stack) + public boolean isItemValidForSlot(int index, @Nonnull ItemStack stack) { return true; } diff --git a/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java index 0ab3b1ddd..9820a1f15 100644 --- a/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java @@ -94,7 +94,7 @@ public class InventoryPersonalChest extends InventoryBasic { for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) { - NBTTagCompound tagCompound = (NBTTagCompound)tagList.getCompoundTagAt(tagCount); + NBTTagCompound tagCompound = tagList.getCompoundTagAt(tagCount); byte slotID = tagCompound.getByte("Slot"); if(slotID >= 0 && slotID < getSizeInventory()) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 86a3310c6..ed9e79c57 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -13,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerAdvancedElectricMachine extends Container { private TileEntityAdvancedElectricMachine tileEntity; @@ -54,16 +56,17 @@ public class ContainerAdvancedElectricMachine extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java index 413a1c8dc..db0759d56 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java @@ -12,6 +12,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerChanceMachine extends Container { private TileEntityChanceMachine tileEntity; @@ -53,16 +55,17 @@ public class ContainerChanceMachine extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -85,7 +88,7 @@ public class ContainerChanceMachine extends Container return ItemStack.EMPTY; } } - else if(slotID == 1) + else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { @@ -95,7 +98,7 @@ public class ContainerChanceMachine extends Container } else if(RecipeHandler.getChanceRecipe(new ItemStackInput(slotStack), tileEntity.getRecipes()) != null) { - if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3) + if(slotID != 0 && slotID != 1) { if(!mergeItemStack(slotStack, 0, 1, false)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java index 59285818a..ce804e653 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java @@ -12,6 +12,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerChemicalCrystallizer extends Container { private TileEntityChemicalCrystallizer tileEntity; @@ -52,16 +54,17 @@ public class ContainerChemicalCrystallizer extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -100,7 +103,7 @@ public class ContainerChemicalCrystallizer extends Container return ItemStack.EMPTY; } } - else if(slotID == 2) + else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java index b7e350500..eb11730f3 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java @@ -13,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerChemicalDissolutionChamber extends Container { private TileEntityChemicalDissolutionChamber tileEntity; @@ -54,16 +56,17 @@ public class ContainerChemicalDissolutionChamber extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -95,7 +98,7 @@ public class ContainerChemicalDissolutionChamber extends Container return ItemStack.EMPTY; } } - else if(slotID == 3) + else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index ab08acb1f..a635c88dd 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -11,6 +11,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerChemicalInfuser extends Container { private TileEntityChemicalInfuser tileEntity; @@ -52,16 +54,17 @@ public class ContainerChemicalInfuser extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -77,7 +80,7 @@ public class ContainerChemicalInfuser extends Container return ItemStack.EMPTY; } } - else if(slotID == 3) + else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index 1d48f6c4f..d4f59a5f4 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -13,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerChemicalOxidizer extends Container { private TileEntityChemicalOxidizer tileEntity; @@ -53,16 +55,17 @@ public class ContainerChemicalOxidizer extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -78,7 +81,7 @@ public class ContainerChemicalOxidizer extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { @@ -95,7 +98,7 @@ public class ContainerChemicalOxidizer extends Container return ItemStack.EMPTY; } } - else if(slotID == 1) + else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index 987c1aa83..44b027fcf 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -14,6 +14,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidUtil; +import javax.annotation.Nonnull; + public class ContainerChemicalWasher extends Container { private TileEntityChemicalWasher tileEntity; @@ -55,16 +57,17 @@ public class ContainerChemicalWasher extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -119,7 +122,7 @@ public class ContainerChemicalWasher extends Container return ItemStack.EMPTY; } } - else if(slotID == 3) + else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java b/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java index 122c843e7..35338fdca 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java @@ -6,6 +6,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerDictionary extends Container { public ContainerDictionary(InventoryPlayer inventory) @@ -27,16 +29,17 @@ public class ContainerDictionary extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return true; } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -50,19 +53,13 @@ public class ContainerDictionary extends Container return ItemStack.EMPTY; } } - else if(slotID > 26) + else { if(!mergeItemStack(slotStack, 0, 26, false)) { return ItemStack.EMPTY; } } - else { - if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) - { - return ItemStack.EMPTY; - } - } if(slotStack.getCount() == 0) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index 177c1027f..a3c2be7fe 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -9,6 +9,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerDigitalMiner extends Container { private TileEntityDigitalMiner tileEntity; @@ -56,16 +58,17 @@ public class ContainerDigitalMiner extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -81,7 +84,7 @@ public class ContainerDigitalMiner extends Container return ItemStack.EMPTY; } } - else if(slotID <= 27) + else { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDoubleElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerDoubleElectricMachine.java index 9213977b0..09eac1c2f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDoubleElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDoubleElectricMachine.java @@ -13,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerDoubleElectricMachine extends Container { private TileEntityDoubleElectricMachine tileEntity; @@ -54,16 +56,17 @@ public class ContainerDoubleElectricMachine extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java index 6f52255dd..d2948ed19 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java @@ -9,6 +9,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerDynamicTank extends Container { private TileEntityDynamicTank tileEntity; @@ -48,16 +50,17 @@ public class ContainerDynamicTank extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index a1bc5e83b..ce077b5a4 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -12,6 +12,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerElectricMachine extends Container { private TileEntityElectricMachine tileEntity; @@ -52,16 +54,17 @@ public class ContainerElectricMachine extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -77,7 +80,7 @@ public class ContainerElectricMachine extends Container } else if(RecipeHandler.getRecipe(new ItemStackInput(slotStack), tileEntity.getRecipes()) != null) { - if(slotID != 0 && slotID != 1 && slotID != 2) + if(slotID != 0 && slotID != 1) { if(!mergeItemStack(slotStack, 0, 1, false)) { @@ -100,7 +103,7 @@ public class ContainerElectricMachine extends Container return ItemStack.EMPTY; } } - else if(slotID == 1) + else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index 94b324815..c630705ab 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -12,6 +12,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidUtil; +import javax.annotation.Nonnull; + public class ContainerElectricPump extends Container { private TileEntityElectricPump tileEntity; @@ -52,16 +54,17 @@ public class ContainerElectricPump extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -93,7 +96,7 @@ public class ContainerElectricPump extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index b06abcdde..3c70867ea 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -13,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerElectrolyticSeparator extends Container { private TileEntityElectrolyticSeparator tileEntity; @@ -54,16 +56,17 @@ public class ContainerElectrolyticSeparator extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -117,26 +120,20 @@ public class ContainerElectrolyticSeparator extends Container } } else { - if(slotID >= 4 && slotID <= 30) + if(slotID <= 30) { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { return ItemStack.EMPTY; } } - else if(slotID > 30) + else { if(!mergeItemStack(slotStack, 4, 30, false)) { return ItemStack.EMPTY; } } - else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) - { - return ItemStack.EMPTY; - } - } } } else { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java index 78ac955c3..d1e247a60 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -13,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerEnergyCube extends Container { private TileEntityEnergyCube tileEntity; @@ -53,16 +55,17 @@ public class ContainerEnergyCube extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -130,7 +133,7 @@ public class ContainerEnergyCube extends Container } } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index 17aa276b4..46772ed9c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; import java.util.Arrays; public class ContainerFactory extends Container @@ -107,16 +108,17 @@ public class ContainerFactory extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -169,7 +171,7 @@ public class ContainerFactory extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, tileEntity.inventory.size()-1, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java index aa279f50e..15345d2cf 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java @@ -7,6 +7,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerFilter extends Container { private TileEntityContainerBlock tileEntity; @@ -44,42 +46,37 @@ public class ContainerFilter extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(slotID >= 0 && slotID <= 26) + if(slotID <= 26) { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) { return ItemStack.EMPTY; } } - else if(slotID > 26) + else { if(!mergeItemStack(slotStack, 0, 26, false)) { return ItemStack.EMPTY; } } - else { - if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) - { - return ItemStack.EMPTY; - } - } if(slotStack.getCount() == 0) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java index 3bca77056..b3e16e203 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java @@ -9,6 +9,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerFluidTank extends Container { private TileEntityFluidTank tileEntity; @@ -48,16 +50,17 @@ public class ContainerFluidTank extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java index 233623b9f..354e6bde1 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java @@ -11,6 +11,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidUtil; +import javax.annotation.Nonnull; + public class ContainerFluidicPlenisher extends Container { private TileEntityFluidicPlenisher tileEntity; @@ -51,16 +53,17 @@ public class ContainerFluidicPlenisher extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -92,7 +95,7 @@ public class ContainerFluidicPlenisher extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java index 04d0ff33a..500712ce0 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java @@ -14,6 +14,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ContainerFormulaicAssemblicator extends Container { private TileEntityFormulaicAssemblicator tileEntity; @@ -95,16 +97,17 @@ public class ContainerFormulaicAssemblicator extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java index aa9f238df..3edfc63b2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java @@ -8,6 +8,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; +import javax.annotation.Nonnull; + public class ContainerFuelwoodHeater extends Container { private TileEntityFuelwoodHeater tileEntity; @@ -46,16 +48,17 @@ public class ContainerFuelwoodHeater extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -71,7 +74,7 @@ public class ContainerFuelwoodHeater extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java index 44d8e1926..f7ec63620 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java @@ -9,6 +9,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerGasTank extends Container { private TileEntityGasTank tileEntity; @@ -48,16 +50,17 @@ public class ContainerGasTank extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java b/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java index ebe6de2b5..eacbc8bc7 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java @@ -13,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerInductionMatrix extends Container { private TileEntityInductionCasing tileEntity; @@ -52,16 +54,17 @@ public class ContainerInductionMatrix extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -129,7 +132,7 @@ public class ContainerInductionMatrix extends Container } } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java b/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java index e034d29fb..c217d06ef 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java @@ -7,6 +7,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerLaserAmplifier extends Container { private TileEntityLaserAmplifier tileEntity; @@ -44,42 +46,37 @@ public class ContainerLaserAmplifier extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } - + + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(slotID >= 0 && slotID <= 26) + if(slotID <= 26) { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) { return ItemStack.EMPTY; } } - else if(slotID > 26) + else { if(!mergeItemStack(slotStack, 0, 26, false)) { return ItemStack.EMPTY; } } - else { - if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) - { - return ItemStack.EMPTY; - } - } if(slotStack.getCount() == 0) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java b/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java index bf1899940..537ff9e5d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java @@ -7,6 +7,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerLaserTractorBeam extends Container { private TileEntityLaserTractorBeam tileEntity; @@ -51,16 +53,17 @@ public class ContainerLaserTractorBeam extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } - + + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 09c68f61f..230141d27 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -14,6 +14,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerMetallurgicInfuser extends Container { private TileEntityMetallurgicInfuser tileEntity; @@ -55,16 +57,17 @@ public class ContainerMetallurgicInfuser extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -95,26 +98,20 @@ public class ContainerMetallurgicInfuser extends Container } } else { - if(slotID >= 4 && slotID <= 30) + if(slotID <= 30) { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { return ItemStack.EMPTY; } } - else if(slotID > 30) + else { if(!mergeItemStack(slotStack, 4, 30, false)) { return ItemStack.EMPTY; } } - else { - if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) - { - return ItemStack.EMPTY; - } - } } } else { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerNull.java b/src/main/java/mekanism/common/inventory/container/ContainerNull.java index 19367463b..261fdf2c6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerNull.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerNull.java @@ -4,6 +4,8 @@ import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; +import javax.annotation.Nonnull; + public class ContainerNull extends Container { private TileEntityContainerBlock tileEntity; @@ -39,7 +41,7 @@ public class ContainerNull extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { if(tileEntity != null) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java index 60cce739b..447d47dfe 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java @@ -8,6 +8,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerOredictionificator extends Container { private TileEntityOredictionificator tileEntity; @@ -47,16 +49,17 @@ public class ContainerOredictionificator extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } - + + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -72,7 +75,7 @@ public class ContainerOredictionificator extends Container } else if(!tileEntity.getResult(slotStack).isEmpty()) { - if(slotID != 0 && slotID != 1) + if(slotID != 0) { if(!mergeItemStack(slotStack, 0, 1, false)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java index 86c451488..18c143ba9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java @@ -11,6 +11,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerPRC extends Container { private TileEntityPRC tileEntity; @@ -51,16 +53,17 @@ public class ContainerPRC extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -83,7 +86,7 @@ public class ContainerPRC extends Container return ItemStack.EMPTY; } } - else if(slotID == 1) + else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java index 78eef026f..965fd578d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java @@ -12,6 +12,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + @ChestContainer(isLargeChest=true) public class ContainerPersonalChest extends Container { @@ -85,7 +87,7 @@ public class ContainerPersonalChest extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { if(isBlock) { @@ -95,6 +97,7 @@ public class ContainerPersonalChest extends Container return true; } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { @@ -137,6 +140,7 @@ public class ContainerPersonalChest extends Container return stack; } + @Nonnull @Override public ItemStack slotClick(int slotId, int dragType, ClickType clickType, EntityPlayer player) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java index 24df7774f..ca424cb33 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java @@ -7,6 +7,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerQuantumEntangloporter extends Container { private TileEntityQuantumEntangloporter tileEntity; @@ -44,42 +46,37 @@ public class ContainerQuantumEntangloporter extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(slotID >= 0 && slotID <= 26) + if(slotID <= 26) { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) { return ItemStack.EMPTY; } } - else if(slotID > 26) + else { if(!mergeItemStack(slotStack, 0, 26, false)) { return ItemStack.EMPTY; } } - else { - if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) - { - return ItemStack.EMPTY; - } - } if(slotStack.getCount() == 0) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java index ecb943e89..567eed085 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java @@ -9,6 +9,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerResistiveHeater extends Container { private TileEntityResistiveHeater tileEntity; @@ -47,16 +49,17 @@ public class ContainerResistiveHeater extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -72,7 +75,7 @@ public class ContainerResistiveHeater extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java index 9c780c5ec..4c17a8280 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java @@ -6,6 +6,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench; import net.minecraft.util.math.BlockPos; +import javax.annotation.Nonnull; + public class ContainerRobitCrafting extends ContainerWorkbench { public EntityRobit robit; @@ -17,7 +19,7 @@ public class ContainerRobitCrafting extends ContainerWorkbench } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return !robit.isDead; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java index d7ad1dc0b..3523f5e1f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -7,6 +7,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerRobitInventory extends Container { public EntityRobit robit; @@ -41,16 +43,17 @@ public class ContainerRobitInventory extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return !robit.isDead; } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java index 6a110ab79..a98eec4cf 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java @@ -8,6 +8,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerRobitMain extends Container { private EntityRobit robit; @@ -43,11 +45,12 @@ public class ContainerRobitMain extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return !robit.isDead; } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java index 193ed3e2c..14aaa95d5 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java @@ -6,6 +6,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerRepair; import net.minecraft.util.math.BlockPos; +import javax.annotation.Nonnull; + public class ContainerRobitRepair extends ContainerRepair { public EntityRobit robit; @@ -18,7 +20,7 @@ public class ContainerRobitRepair extends ContainerRepair } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return !robit.isDead; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index e6c9d2ee9..cd4a63702 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -11,6 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; +import javax.annotation.Nonnull; + public class ContainerRobitSmelting extends Container { public EntityRobit robit; @@ -45,7 +47,7 @@ public class ContainerRobitSmelting extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return !robit.isDead; } @@ -108,11 +110,12 @@ public class ContainerRobitSmelting extends Container } } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -142,14 +145,14 @@ public class ContainerRobitSmelting extends Container return ItemStack.EMPTY; } } - else if(slotID >= 3 && slotID < 30) + else if(slotID < 30) { if(!mergeItemStack(slotStack, 30, 39, false)) { return ItemStack.EMPTY; } } - else if(slotID >= 30 && slotID < 39 && !mergeItemStack(slotStack, 3, 30, false)) + else if(slotID < 39 && !mergeItemStack(slotStack, 3, 30, false)) { return ItemStack.EMPTY; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index cfbcc2a9c..91819f98b 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -13,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerRotaryCondensentrator extends Container { private TileEntityRotaryCondensentrator tileEntity; @@ -55,16 +57,17 @@ public class ContainerRotaryCondensentrator extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java b/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java index 19afded4a..c637dd587 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java @@ -8,6 +8,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerSecurityDesk extends Container { private TileEntitySecurityDesk tileEntity; @@ -48,16 +50,17 @@ public class ContainerSecurityDesk extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java index 949bfd730..0d86c4ca3 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java @@ -9,6 +9,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerSeismicVibrator extends Container { private TileEntitySeismicVibrator tileEntity; @@ -47,16 +49,17 @@ public class ContainerSeismicVibrator extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -72,7 +75,7 @@ public class ContainerSeismicVibrator extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java index a05d80e83..016d2199c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java @@ -9,6 +9,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerSolarNeutronActivator extends Container { private TileEntitySolarNeutronActivator tileEntity; @@ -48,16 +50,17 @@ public class ContainerSolarNeutronActivator extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java index a030f001c..98afb24d4 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java @@ -9,6 +9,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ContainerTeleporter extends Container { private TileEntityTeleporter tileEntity; @@ -47,16 +49,17 @@ public class ContainerTeleporter extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -72,7 +75,7 @@ public class ContainerTeleporter extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java index e1904dcc1..cdc20c211 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java @@ -11,6 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; +import javax.annotation.Nonnull; + public class ContainerThermalEvaporationController extends Container { private TileEntityThermalEvaporationController tileEntity; @@ -53,16 +55,17 @@ public class ContainerThermalEvaporationController extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return tileEntity.isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { @@ -86,7 +89,7 @@ public class ContainerThermalEvaporationController extends Container return ItemStack.EMPTY; } } - else if(slotID == 2) + else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { @@ -103,7 +106,7 @@ public class ContainerThermalEvaporationController extends Container return ItemStack.EMPTY; } } - else if(slotID == 0) + else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index c9c1296bf..1e5e98b12 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -14,6 +14,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import javax.annotation.Nonnull; + public class ContainerUpgradeManagement extends Container { private IUpgradeTile tileEntity; @@ -64,16 +66,17 @@ public class ContainerUpgradeManagement extends Container } @Override - public boolean canInteractWith(EntityPlayer entityplayer) + public boolean canInteractWith(@Nonnull EntityPlayer entityplayer) { return ((TileEntityContainerBlock)tileEntity).isUsableByPlayer(entityplayer); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = ItemStack.EMPTY; - Slot currentSlot = (Slot)inventorySlots.get(slotID); + Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) { diff --git a/src/main/java/mekanism/common/item/ItemAlloy.java b/src/main/java/mekanism/common/item/ItemAlloy.java index b043dee15..24ae8d7c2 100644 --- a/src/main/java/mekanism/common/item/ItemAlloy.java +++ b/src/main/java/mekanism/common/item/ItemAlloy.java @@ -14,13 +14,16 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemAlloy extends ItemMekanism { public ItemAlloy() { super(); } - + + @Nonnull @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 7f440e158..276cc0666 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -41,6 +41,8 @@ import com.google.common.collect.Multimap; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemAtomicDisassembler extends ItemEnergized { public double HOE_USAGE = 10 * general.DISASSEMBLER_USAGE; @@ -51,7 +53,7 @@ public class ItemAtomicDisassembler extends ItemEnergized } @Override - public boolean canHarvestBlock(IBlockState state, ItemStack stack) + public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack) { return state.getBlock() != Blocks.BEDROCK; } @@ -191,8 +193,9 @@ public class ItemAtomicDisassembler extends ItemEnergized return true; } + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, @Nonnull EnumHand hand) { ItemStack itemstack = entityplayer.getHeldItem(hand); @@ -210,6 +213,7 @@ public class ItemAtomicDisassembler extends ItemEnergized return new ActionResult<>(EnumActionResult.PASS, itemstack); } + @Nonnull @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { @@ -277,7 +281,7 @@ public class ItemAtomicDisassembler extends ItemEnergized if(block == Blocks.DIRT) { - switch((BlockDirt.DirtType)iblockstate.getValue(BlockDirt.VARIANT)) + switch(iblockstate.getValue(BlockDirt.VARIANT)) { case DIRT: setBlock(stack, playerIn, worldIn, pos, Blocks.FARMLAND.getDefaultState()); @@ -359,7 +363,8 @@ public class ItemAtomicDisassembler extends ItemEnergized { return false; } - + + @Nonnull @Override public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index f1fa09df2..08807ec54 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -27,6 +27,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemBalloon extends ItemMekanism implements IMetaItem { public ItemBalloon() @@ -62,7 +64,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; for(int i = 0; i < EnumColor.DYES.length; i++) @@ -78,8 +80,9 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem } } + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, @Nonnull EnumHand hand) { ItemStack itemstack = entityplayer.getHeldItem(hand); @@ -98,8 +101,9 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) + public String getItemStackDisplayName(@Nonnull ItemStack stack) { EnumColor color = getColor(stack); String dyeName = color.getDyedName(); @@ -117,6 +121,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem return dyeName + " " + LangUtils.localize("tooltip.balloon"); } + @Nonnull @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { @@ -199,11 +204,12 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem public class DispenserBehavior extends BehaviorDefaultDispenseItem { + @Nonnull @Override public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { Coord4D coord = new Coord4D(source.getX(), source.getY(), source.getZ(), source.getWorld().provider.getDimension()); - EnumFacing side = (EnumFacing)source.getBlockState().getValue(BlockDispenser.FACING); + EnumFacing side = source.getBlockState().getValue(BlockDispenser.FACING); List entities = source.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, coord.offset(side).getBoundingBox()); boolean latched = false; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 1ab4e1bed..59abb7ee4 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -1,6 +1,5 @@ package mekanism.common.item; -import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; @@ -43,6 +42,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + /** * Item class for handling multiple metal block IDs. * 0:0: Osmium Block @@ -142,7 +143,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { BasicBlockType type = BasicBlockType.get(itemstack); @@ -199,8 +200,9 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return BasicBlockType.get(stack) == BasicBlockType.BIN && ItemDataUtils.hasData(stack, "newCount"); } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack stack) + public ItemStack getContainerItem(@Nonnull ItemStack stack) { if(BasicBlockType.get(stack) == BasicBlockType.BIN) { @@ -222,7 +224,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState state) { boolean place = true; @@ -283,7 +285,8 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return place; } - + + @Nonnull @Override public String getTranslationKey(ItemStack itemstack) { diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 1e3710eee..2a5e8786f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -29,6 +29,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemBlockCardboardBox extends ItemBlock { private static boolean isMonitoring; @@ -46,7 +48,7 @@ public class ItemBlockCardboardBox extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.blockData") + ": " + LangUtils.transYesNo(getBlockData(itemstack) != null)); BlockData data = getBlockData(itemstack); @@ -61,7 +63,7 @@ public class ItemBlockCardboardBox extends ItemBlock { list.add(LangUtils.localize("tooltip.tile") + ": " + data.tileTag.getString("id")); } - } catch(Exception e) {} + } catch(Exception ignored) {} } } @@ -71,6 +73,7 @@ public class ItemBlockCardboardBox extends ItemBlock return i; } + @Nonnull @Override public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { @@ -128,7 +131,7 @@ public class ItemBlockCardboardBox extends ItemBlock } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState state) { if(world.isRemote) { diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index c164a97df..78dad21fe 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -4,7 +4,6 @@ import cofh.redstoneflux.api.IEnergyContainerItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; -import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -59,6 +58,8 @@ import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + @InterfaceList({ @Interface(iface = "cofh.redstoneflux.api.IEnergyContainerItem", modid = MekanismHooks.REDSTONEFLUX_MOD_ID), @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = MekanismHooks.IC2_MOD_ID) @@ -79,7 +80,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(EnergyCubeTier.values()[getBaseTier(itemstack).ordinal()].maxEnergy)); @@ -111,15 +112,16 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS return stack; } - + + @Nonnull @Override - public String getItemStackDisplayName(ItemStack itemstack) + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { return LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name"); } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState state) { boolean place = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, state); @@ -133,32 +135,26 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS { tileEntity.configComponent.fillConfig(TransmissionType.ENERGY, tileEntity.getEnergy() > 0 ? 2 : 1); } - - if(tileEntity instanceof ISecurityTile) - { - ISecurityTile security = (ISecurityTile)tileEntity; - security.getSecurity().setOwnerUUID(getOwnerUUID(stack)); - - if(hasSecurity(stack)) - { - security.getSecurity().setMode(getSecurity(stack)); - } - - if(getOwnerUUID(stack) == null) - { - security.getSecurity().setOwnerUUID(player.getUniqueID()); - } - } - - if(tileEntity instanceof ISideConfiguration) - { - ISideConfiguration config = (ISideConfiguration)tileEntity; - if(ItemDataUtils.hasData(stack, "sideDataStored")) - { - config.getConfig().read(ItemDataUtils.getDataMap(stack)); - config.getEjector().read(ItemDataUtils.getDataMap(stack)); - } + ISecurityTile security = tileEntity; + security.getSecurity().setOwnerUUID(getOwnerUUID(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } + + if(getOwnerUUID(stack) == null) + { + security.getSecurity().setOwnerUUID(player.getUniqueID()); + } + + ISideConfiguration config = tileEntity; + + if(ItemDataUtils.hasData(stack, "sideDataStored")) + { + config.getConfig().read(ItemDataUtils.getDataMap(stack)); + config.getEjector().read(ItemDataUtils.getDataMap(stack)); } ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); @@ -327,7 +323,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS } @Override - public int getRGBDurabilityForDisplay(ItemStack stack) + public int getRGBDurabilityForDisplay(@Nonnull ItemStack stack) { return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 903a8738c..c9951e7eb 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -1,6 +1,5 @@ package mekanism.common.item; -import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -49,6 +48,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem, ISecurityItem { public Block metaBlock; @@ -74,14 +75,15 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI return i; } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack itemstack) + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { return LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name"); } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState state) { boolean place = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, state); @@ -91,32 +93,26 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()]; tileEntity.gasTank.setMaxGas(tileEntity.tier.storage); tileEntity.gasTank.setGas(getGas(stack)); - - if(tileEntity instanceof ISecurityTile) - { - ISecurityTile security = (ISecurityTile)tileEntity; - security.getSecurity().setOwnerUUID(getOwnerUUID(stack)); - - if(hasSecurity(stack)) - { - security.getSecurity().setMode(getSecurity(stack)); - } - - if(getOwnerUUID(stack) == null) - { - security.getSecurity().setOwnerUUID(player.getUniqueID()); - } - } - - if(tileEntity instanceof ISideConfiguration) - { - ISideConfiguration config = (ISideConfiguration)tileEntity; - if(ItemDataUtils.hasData(stack, "sideDataStored")) - { - config.getConfig().read(ItemDataUtils.getDataMap(stack)); - config.getEjector().read(ItemDataUtils.getDataMap(stack)); - } + ISecurityTile security = tileEntity; + security.getSecurity().setOwnerUUID(getOwnerUUID(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } + + if(getOwnerUUID(stack) == null) + { + security.getSecurity().setOwnerUUID(player.getUniqueID()); + } + + ISideConfiguration config = tileEntity; + + if(ItemDataUtils.hasData(stack, "sideDataStored")) + { + config.getConfig().read(ItemDataUtils.getDataMap(stack)); + config.getEjector().read(ItemDataUtils.getDataMap(stack)); } ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); @@ -132,7 +128,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { GasStack gasStack = getGas(itemstack); @@ -199,7 +195,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; for(GasTankTier tier : GasTankTier.values()) @@ -348,7 +344,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public int getRGBDurabilityForDisplay(ItemStack stack) + public int getRGBDurabilityForDisplay(@Nonnull ItemStack stack) { return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index 0ffe738ce..7bb1f2b6f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import java.util.ArrayList; - import mcmultipart.api.multipart.IMultipart; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -17,8 +15,6 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; @@ -27,6 +23,8 @@ import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; +import javax.annotation.Nonnull; + public class ItemBlockGlowPanel extends ItemBlockMultipartAble { public Block metaBlock; @@ -46,7 +44,7 @@ public class ItemBlockGlowPanel extends ItemBlockMultipartAble } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState state) { if (stack.getItemDamage() >= EnumColor.DYES.length){ return false; @@ -77,7 +75,7 @@ public class ItemBlockGlowPanel extends ItemBlockMultipartAble } @Override - public void getSubItems(CreativeTabs tab, NonNullList listToAddTo) + public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList listToAddTo) { if(!isInCreativeTab(tab)) return; for(EnumColor color : EnumColor.DYES) @@ -86,8 +84,9 @@ public class ItemBlockGlowPanel extends ItemBlockMultipartAble } } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) + public String getItemStackDisplayName(@Nonnull ItemStack stack) { int itemDamage = stack.getItemDamage(); if (itemDamage >= EnumColor.DYES.length){ diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 923c0b66d..1f86f88f6 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -4,7 +4,6 @@ import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; @@ -93,6 +92,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import cofh.redstoneflux.api.IEnergyContainerItem; +import javax.annotation.Nonnull; + /** * Item class for handling multiple machine block IDs. * 0:0: Enrichment Chamber @@ -160,6 +161,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return i; } + @Nonnull @Override public String getTranslationKey(ItemStack itemstack) { @@ -170,9 +172,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return "null"; } - + + @Nonnull @Override - public String getItemStackDisplayName(ItemStack itemstack) + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { MachineType type = MachineType.get(itemstack); @@ -197,7 +200,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { MachineType type = MachineType.get(itemstack); @@ -292,9 +295,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack)); } } - + + @Nonnull @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(EntityPlayer player, World world, @Nonnull BlockPos pos, @Nonnull EnumHand hand, @Nonnull EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); MachineType type = MachineType.get(stack); @@ -308,7 +312,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState state) { boolean place = true; @@ -487,8 +491,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, @Nonnull EnumHand hand) { ItemStack itemstack = entityplayer.getHeldItem(hand); MachineType type = MachineType.get(itemstack); @@ -517,80 +522,74 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(SecurityUtils.canAccess(entityplayer, itemstack)) { RayTraceResult pos = rayTrace(world, entityplayer, !entityplayer.isSneaking()); - - if(pos == null) - { - return new ActionResult<>(EnumActionResult.FAIL, itemstack); - } - else { - if(pos.typeOfHit == RayTraceResult.Type.BLOCK) - { - Coord4D coord = new Coord4D(pos.getBlockPos(), world); - - if(!world.provider.canMineBlock(entityplayer, coord.getPos())) - { - return new ActionResult<>(EnumActionResult.FAIL, itemstack); - } - - if(!entityplayer.isSneaking()) - { - if(!entityplayer.canPlayerEdit(coord.getPos(), pos.sideHit, itemstack)) - { - return new ActionResult<>(EnumActionResult.FAIL, itemstack); - } - - FluidStack fluid = MekanismUtils.getFluid(world, coord, false); - - if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) - { - int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); - - if(fluid.amount > needed) - { - return new ActionResult<>(EnumActionResult.FAIL, itemstack); - } - - if(getFluidStack(itemstack) == null) - { - setFluidStack(fluid, itemstack); - } - else { - FluidStack newStack = getFluidStack(itemstack); - newStack.amount += fluid.amount; - setFluidStack(newStack, itemstack); - } - - world.setBlockToAir(coord.getPos()); - } - } - else { - FluidStack stored = getFluidStack(itemstack); - - if(stored == null || stored.amount < Fluid.BUCKET_VOLUME) + + if(pos.typeOfHit == RayTraceResult.Type.BLOCK) + { + Coord4D coord = new Coord4D(pos.getBlockPos(), world); + + if(!world.provider.canMineBlock(entityplayer, coord.getPos())) + { + return new ActionResult<>(EnumActionResult.FAIL, itemstack); + } + + if(!entityplayer.isSneaking()) + { + if(!entityplayer.canPlayerEdit(coord.getPos(), pos.sideHit, itemstack)) + { + return new ActionResult<>(EnumActionResult.FAIL, itemstack); + } + + FluidStack fluid = MekanismUtils.getFluid(world, coord, false); + + if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) + { + int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); + + if(fluid.amount > needed) { return new ActionResult<>(EnumActionResult.FAIL, itemstack); } - - Coord4D trans = coord.offset(pos.sideHit); - - if(!entityplayer.canPlayerEdit(trans.getPos(), pos.sideHit, itemstack)) - { - return new ActionResult<>(EnumActionResult.FAIL, itemstack); - } - - if(tryPlaceContainedLiquid(world, itemstack, trans.getPos()) && !entityplayer.capabilities.isCreativeMode) - { - FluidStack newStack = stored.copy(); - newStack.amount -= Fluid.BUCKET_VOLUME; - - setFluidStack(newStack.amount > 0 ? newStack : null, itemstack); - } - } - } - - return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); - } - } + + if(getFluidStack(itemstack) == null) + { + setFluidStack(fluid, itemstack); + } + else { + FluidStack newStack = getFluidStack(itemstack); + newStack.amount += fluid.amount; + setFluidStack(newStack, itemstack); + } + + world.setBlockToAir(coord.getPos()); + } + } + else { + FluidStack stored = getFluidStack(itemstack); + + if(stored == null || stored.amount < Fluid.BUCKET_VOLUME) + { + return new ActionResult<>(EnumActionResult.FAIL, itemstack); + } + + Coord4D trans = coord.offset(pos.sideHit); + + if(!entityplayer.canPlayerEdit(trans.getPos(), pos.sideHit, itemstack)) + { + return new ActionResult<>(EnumActionResult.FAIL, itemstack); + } + + if(tryPlaceContainedLiquid(world, itemstack, trans.getPos()) && !entityplayer.capabilities.isCreativeMode) + { + FluidStack newStack = stored.copy(); + newStack.amount -= Fluid.BUCKET_VOLUME; + + setFluidStack(newStack.amount > 0 ? newStack : null, itemstack); + } + } + } + + return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); + } else { SecurityUtils.displayNoAccess(entityplayer); } @@ -979,7 +978,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { return new ItemCapabilityWrapper(stack, new TeslaItemWrapper(), new ForgeEnergyItemWrapper(), new FluidItemWrapper()) { @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY) { diff --git a/src/main/java/mekanism/common/item/ItemBlockMultipartAble.java b/src/main/java/mekanism/common/item/ItemBlockMultipartAble.java index 09f69dab2..03e5cacdb 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMultipartAble.java +++ b/src/main/java/mekanism/common/item/ItemBlockMultipartAble.java @@ -4,16 +4,13 @@ import mcmultipart.api.container.IMultipartContainer; import mcmultipart.api.multipart.IMultipart; import mcmultipart.api.multipart.MultipartHelper; import mcmultipart.api.slot.IPartSlot; -import mcmultipart.multipart.MultipartRegistry; import mekanism.common.Mekanism; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.multipart.MultipartMekanism; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; @@ -23,6 +20,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.Optional; /** @@ -38,8 +36,9 @@ public abstract class ItemBlockMultipartAble extends ItemBlock /** * Reimplementation of onItemUse that will divert to MCMultipart placement functions if applicable */ + @Nonnull @Override - public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) + public EnumActionResult onItemUse(EntityPlayer player, World worldIn, @Nonnull BlockPos pos, @Nonnull EnumHand hand, @Nonnull EnumFacing facing, float hitX, float hitY, float hitZ) { IBlockState iblockstate = worldIn.getBlockState(pos); Block block = iblockstate.getBlock(); @@ -112,13 +111,13 @@ public abstract class ItemBlockMultipartAble extends ItemBlock protected abstract IMultipart getMultiPart(); @Override - public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side, EntityPlayer player, ItemStack stack) + public boolean canPlaceBlockOnSide(World worldIn, @Nonnull BlockPos pos, @Nonnull EnumFacing side, EntityPlayer player, ItemStack stack) { return super.canPlaceBlockOnSide(worldIn, pos, side, player, stack) || (Mekanism.hooks.MCMPLoaded && MultipartHelper.getContainer(worldIn, pos).isPresent()); } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState newState) { if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)){ return false; diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 994bfd75b..8d081a8bd 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -16,6 +16,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + /** * Item class for handling multiple ore block IDs. * 0: Osmium Ore @@ -37,7 +39,7 @@ public class ItemBlockOre extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { @@ -54,6 +56,7 @@ public class ItemBlockOre extends ItemBlock return i; } + @Nonnull @Override public String getTranslationKey(ItemStack itemstack) { diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index dc024cd61..e467e574a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -8,6 +8,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; + public class ItemBlockPlastic extends ItemBlock { public Block metaBlock; @@ -25,8 +27,9 @@ public class ItemBlockPlastic extends ItemBlock return i; } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) + public String getItemStackDisplayName(@Nonnull ItemStack stack) { EnumDyeColor dyeColour = EnumDyeColor.byDyeDamage(stack.getItemDamage()&15); EnumColor colour = EnumColor.DYES[dyeColour.getDyeDamage()]; diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java index cb227e955..00ef7f3c7 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -1,6 +1,5 @@ package mekanism.common.item; -import java.util.ArrayList; import java.util.List; import mcmultipart.api.multipart.IMultipart; @@ -27,7 +26,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -37,6 +35,8 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemBlockTransmitter extends ItemBlockMultipartAble implements ITierItem { public Block metaBlock; @@ -56,7 +56,7 @@ public class ItemBlockTransmitter extends ItemBlockMultipartAble implements ITie } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState state) { boolean place = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, state); @@ -76,7 +76,7 @@ public class ItemBlockTransmitter extends ItemBlockMultipartAble implements ITie @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { @@ -169,6 +169,7 @@ public class ItemBlockTransmitter extends ItemBlockMultipartAble implements ITie } } + @Nonnull @Override public String getTranslationKey(ItemStack stack) { diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index 396ee1d61..24ef2a382 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -6,6 +6,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemClump extends ItemMekanism implements IMetaItem @@ -29,7 +30,7 @@ public class ItemClump extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) @@ -38,6 +39,7 @@ public class ItemClump extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index e547333e6..0915079e8 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -27,6 +27,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemConfigurationCard extends ItemMekanism { public ItemConfigurationCard() @@ -45,6 +47,7 @@ public class ItemConfigurationCard extends ItemMekanism list.add(EnumColor.GREY + LangUtils.localize("gui.data") + ": " + EnumColor.INDIGO + LangUtils.localize(getDataType(itemstack))); } + @Nonnull @Override public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index f78e9ecda..c0cb4d431 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -3,7 +3,6 @@ package mekanism.common.item; import cofh.api.item.IToolHammer; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Locale; @@ -39,7 +38,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -57,6 +55,8 @@ import buildcraft.api.tools.IToolWrench; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + @InterfaceList({ @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = MekanismHooks.BUILDCRAFT_MOD_ID), @Interface(iface = "cofh.api.item.IToolHammer", modid = MekanismHooks.COFH_API_MOD_ID) @@ -81,6 +81,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool list.add(EnumColor.PINK + LangUtils.localize("gui.state") + ": " + getColor(getState(itemstack)) + getStateDisplay(getState(itemstack))); } + @Nonnull @Override public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { @@ -177,7 +178,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool if(slotStack.hasTagCompound()) { - item.getItem().setTagCompound((NBTTagCompound)slotStack.getTagCompound().copy()); + item.getItem().setTagCompound(slotStack.getTagCompound().copy()); } float k = 0.05F; diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index a3e7eb5a7..eb681e43f 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -6,6 +6,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; + public class ItemControlCircuit extends ItemMekanism implements IMetaItem { public ItemControlCircuit() @@ -27,7 +29,7 @@ public class ItemControlCircuit extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(BaseTier tier : BaseTier.values()) @@ -39,6 +41,7 @@ public class ItemControlCircuit extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index eb59ff5a4..b1f9d2362 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -22,6 +22,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemCraftingFormula extends ItemMekanism { public static ModelResourceLocation MODEL = new ModelResourceLocation("mekanism:CraftingFormula", "inventory"); @@ -78,9 +80,10 @@ public class ItemCraftingFormula extends ItemMekanism list.add(EnumColor.GREY + " - " + stack.getDisplayName() + " (" + stack.getCount() + ")"); } } - + + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { ItemStack stack = player.getHeldItem(hand); @@ -105,9 +108,10 @@ public class ItemCraftingFormula extends ItemMekanism { return getInventory(stack) != null ? 1 : 64; } - + + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) + public String getItemStackDisplayName(@Nonnull ItemStack stack) { if(getInventory(stack) == null) { diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index e75cb5836..7a98103e8 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -6,6 +6,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemCrystal extends ItemMekanism implements IMetaItem @@ -29,7 +30,7 @@ public class ItemCrystal extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) @@ -38,6 +39,7 @@ public class ItemCrystal extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 1f80189c4..d264904ca 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -18,6 +18,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemDictionary extends ItemMekanism { public ItemDictionary() @@ -26,6 +28,7 @@ public class ItemDictionary extends ItemMekanism setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { @@ -36,36 +39,34 @@ public class ItemDictionary extends ItemMekanism IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); - if(block != null) + if(world.isRemote) { - if(world.isRemote) + ItemStack testStack = new ItemStack(block, 1, block.getMetaFromState(state)); + List names = MekanismUtils.getOreDictName(testStack); + + if(!names.isEmpty()) { - ItemStack testStack = new ItemStack(block, 1, block.getMetaFromState(state)); - List names = MekanismUtils.getOreDictName(testStack); + player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.keysFound") + ":")); - if(!names.isEmpty()) + for(String name : names) { - player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.keysFound") + ":")); - - for(String name : names) - { - player.sendMessage(new TextComponentString(EnumColor.DARK_GREEN + " - " + name)); - } - } - else { - player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.noKey") + ".")); + player.sendMessage(new TextComponentString(EnumColor.DARK_GREEN + " - " + name)); } } - - return EnumActionResult.SUCCESS; + else { + player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.noKey") + ".")); + } } + + return EnumActionResult.SUCCESS; } return EnumActionResult.PASS; } + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, @Nonnull EnumHand hand) { ItemStack itemstack = entityplayer.getHeldItem(hand); diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 5ff9b03df..0c26f95de 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -7,6 +7,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; + public class ItemDirtyDust extends ItemMekanism implements IMetaItem { public ItemDirtyDust() @@ -29,7 +31,7 @@ public class ItemDirtyDust extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) @@ -38,6 +40,7 @@ public class ItemDirtyDust extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index 832105619..c40343505 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -6,6 +6,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemDust extends ItemMekanism implements IMetaItem @@ -29,7 +30,7 @@ public class ItemDust extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) @@ -38,6 +39,7 @@ public class ItemDust extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 47b7cfe57..a67543379 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -30,6 +30,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemElectricBow extends ItemEnergized implements IItemNetwork { public ItemElectricBow() @@ -131,6 +133,7 @@ public class ItemElectricBow extends ItemEnergized implements IItemNetwork return 72000; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack itemstack) { @@ -167,8 +170,9 @@ public class ItemElectricBow extends ItemEnergized implements IItemNetwork return !stack.isEmpty() && stack.getItem() instanceof ItemArrow; } + @Nonnull @Override - public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, @Nonnull EnumHand hand) { ItemStack itemStackIn = playerIn.getHeldItem(hand); boolean flag = !findAmmo(playerIn).isEmpty(); @@ -178,7 +182,7 @@ public class ItemElectricBow extends ItemEnergized implements IItemNetwork if(!playerIn.capabilities.isCreativeMode && !flag) { - return !flag ? new ActionResult<>(EnumActionResult.FAIL, itemStackIn) : new ActionResult<>(EnumActionResult.PASS, itemStackIn); + return new ActionResult<>(EnumActionResult.FAIL, itemStackIn); } else { playerIn.setActiveHand(hand); diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 6dba037f7..974325d84 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -32,6 +32,8 @@ import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = MekanismHooks.IC2_MOD_ID), @Interface(iface = "cofh.redstoneflux.api.IEnergyContainerItem", modid = MekanismHooks.REDSTONEFLUX_MOD_ID), @@ -63,7 +65,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec } @Override - public int getRGBDurabilityForDisplay(ItemStack stack) + public int getRGBDurabilityForDisplay(@Nonnull ItemStack stack) { return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } @@ -81,7 +83,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; ItemStack discharged = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index 3337ddf91..ab013ea4d 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -20,6 +20,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemFlamethrower extends ItemMekanism implements IGasItem { public int TRANSFER_RATE = 16; @@ -122,7 +124,7 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem } @Override - public int getRGBDurabilityForDisplay(ItemStack stack) + public int getRGBDurabilityForDisplay(@Nonnull ItemStack stack) { return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } @@ -156,7 +158,7 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; ItemStack empty = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 6dc31c917..f88670b26 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -44,6 +44,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = MekanismHooks.IC2_MOD_ID), @Interface(iface = "cofh.redstoneflux.api.IEnergyContainerItem", modid = MekanismHooks.REDSTONEFLUX_MOD_ID), @@ -96,7 +98,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; ItemStack discharged = new ItemStack(this); @@ -209,7 +211,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public int getRGBDurabilityForDisplay(ItemStack stack) + public int getRGBDurabilityForDisplay(@Nonnull ItemStack stack) { return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 15ac8d24b..3cc6a3905 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -27,6 +27,8 @@ import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemGaugeDropper extends ItemMekanism implements IGasItem { public static int CAPACITY = Fluid.BUCKET_VOLUME; @@ -48,7 +50,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; list.add(getEmptyItem()); @@ -68,9 +70,10 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem return 1D-Math.max(gasRatio, fluidRatio); } - + + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { ItemStack stack = player.getHeldItem(hand); @@ -102,8 +105,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem { list.add(LangUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); } - else if(fluidStack != null) - { + else { list.add(LangUtils.localize("tooltip.stored") + " " + fluidStack.getFluid().getLocalizedName(fluidStack) + ": " + fluidStack.amount); } } diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index d3055a65e..d0352c966 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -6,6 +6,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; + public class ItemHDPE extends ItemMekanism implements IMetaItem { public ItemHDPE() @@ -28,7 +30,7 @@ public class ItemHDPE extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < PlasticItem.values().length; counter++) @@ -37,6 +39,7 @@ public class ItemHDPE extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 319ad0b20..ad3026208 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -5,6 +5,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemIngot extends ItemMekanism implements IMetaItem @@ -32,7 +33,7 @@ public class ItemIngot extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < en_USNames.length; counter++) @@ -41,6 +42,7 @@ public class ItemIngot extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index f81ecad88..e4318fe9a 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -34,6 +34,8 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor { public int TRANSFER_RATE = 16; @@ -57,7 +59,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor } @Override - public int getRGBDurabilityForDisplay(ItemStack stack) + public int getRGBDurabilityForDisplay(@Nonnull ItemStack stack) { return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } @@ -212,7 +214,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; ItemStack empty = new ItemStack(this); @@ -251,7 +253,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor } @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) + public ArmorProperties getProperties(EntityLivingBase player, @Nonnull ItemStack armor, DamageSource source, double damage, int slot) { if(this == MekanismItems.Jetpack) { @@ -266,7 +268,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor } @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) + public int getArmorDisplay(EntityPlayer player, @Nonnull ItemStack armor, int slot) { if(armor.getItem() == MekanismItems.Jetpack) { @@ -281,5 +283,5 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor } @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {} + public void damageArmor(EntityLivingBase entity, @Nonnull ItemStack stack, DamageSource source, int damage, int slot) {} } diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 944524eea..bab4bcf0d 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -22,6 +22,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemNetworkReader extends ItemEnergized { public static double ENERGY_PER_USE = 400; @@ -31,6 +33,7 @@ public class ItemNetworkReader extends ItemEnergized super(60000); } + @Nonnull @Override public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { @@ -89,7 +92,7 @@ public class ItemNetworkReader extends ItemEnergized TileEntity tile = coord.getTileEntity(world); - if(tile != null && CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite())) + if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite())) { IGridTransmitter transmitter = CapabilityUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite()); diff --git a/src/main/java/mekanism/common/item/ItemNugget.java b/src/main/java/mekanism/common/item/ItemNugget.java index c1b382020..f20d2d3c6 100644 --- a/src/main/java/mekanism/common/item/ItemNugget.java +++ b/src/main/java/mekanism/common/item/ItemNugget.java @@ -5,6 +5,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemNugget extends ItemMekanism implements IMetaItem @@ -28,7 +29,7 @@ public class ItemNugget extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < ItemIngot.en_USNames.length; counter++) @@ -37,6 +38,7 @@ public class ItemNugget extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java index 7e9a7ad49..741fc477d 100644 --- a/src/main/java/mekanism/common/item/ItemOtherDust.java +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -5,6 +5,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemOtherDust extends ItemMekanism implements IMetaItem @@ -36,7 +37,7 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < subtypes.length; counter++) @@ -48,6 +49,7 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 9dd9e8bf6..1644763d2 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -28,6 +28,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem { public ItemPortableTeleporter() @@ -50,8 +52,9 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem super.addInformation(itemstack, world, list, flag); } + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, @Nonnull EnumHand hand) { ItemStack itemstack = entityplayer.getHeldItem(hand); diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index 8ce7ca1e9..a1ac859c1 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -9,6 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ItemProxy extends Item { public ItemProxy() @@ -17,8 +19,9 @@ public class ItemProxy extends Item setMaxDamage(1); } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack stack) + public ItemStack getContainerItem(@Nonnull ItemStack stack) { return getSavedItem(stack); } diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 98234e9d3..bafe53562 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -22,6 +22,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemRobit extends ItemEnergized implements ISustainedInventory { public ItemRobit() @@ -39,6 +41,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } + @Nonnull @Override public EnumActionResult onItemUse(EntityPlayer entityplayer, World world, BlockPos pos, EnumHand hand, EnumFacing side, float posX, float posY, float posZ) { diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index dea718536..f3478f906 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -30,6 +30,8 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemScubaTank extends ItemArmor implements IGasItem { public int TRANSFER_RATE = 16; @@ -70,7 +72,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem } @Override - public int getRGBDurabilityForDisplay(ItemStack stack) + public int getRGBDurabilityForDisplay(@Nonnull ItemStack stack) { return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } @@ -222,7 +224,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; ItemStack empty = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index f82f249bc..55b058c73 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -17,6 +17,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.List; public class ItemSeismicReader extends ItemEnergized @@ -52,8 +53,9 @@ public class ItemSeismicReader extends ItemEnergized } } + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer entityplayer, @Nonnull EnumHand hand) { Chunk3D chunk = new Chunk3D(entityplayer); ItemStack itemstack = entityplayer.getHeldItem(hand); diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index 3b541585c..b0572945a 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -6,6 +6,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemShard extends ItemMekanism implements IMetaItem @@ -29,7 +30,7 @@ public class ItemShard extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) @@ -38,6 +39,7 @@ public class ItemShard extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemTierInstaller.java b/src/main/java/mekanism/common/item/ItemTierInstaller.java index a7e6cf2a6..8f7cc362f 100644 --- a/src/main/java/mekanism/common/item/ItemTierInstaller.java +++ b/src/main/java/mekanism/common/item/ItemTierInstaller.java @@ -15,6 +15,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.Locale; public class ItemTierInstaller extends ItemMekanism implements IMetaItem @@ -25,7 +26,8 @@ public class ItemTierInstaller extends ItemMekanism implements IMetaItem setMaxStackSize(1); setHasSubtypes(true); } - + + @Nonnull @Override public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { @@ -74,7 +76,7 @@ public class ItemTierInstaller extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList itemList) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList itemList) { if(!isInCreativeTab(tabs)) return; for(BaseTier tier : BaseTier.values()) @@ -86,6 +88,7 @@ public class ItemTierInstaller extends ItemMekanism implements IMetaItem } } + @Nonnull @Override public String getTranslationKey(ItemStack item) { diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index cdf9a1d2a..bd60010e3 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -23,6 +23,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; +import javax.annotation.Nonnull; + public class ItemUpgrade extends ItemMekanism implements IUpgradeItem { private Upgrade upgrade; @@ -52,7 +54,8 @@ public class ItemUpgrade extends ItemMekanism implements IUpgradeItem { return upgrade; } - + + @Nonnull @Override public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 2b6ea3a5c..2360b1e9f 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -22,6 +22,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemWalkieTalkie extends ItemMekanism implements IItemNetwork { public static ModelResourceLocation OFF_MODEL = new ModelResourceLocation("mekanism:WalkieTalkie", "inventory"); @@ -51,8 +53,9 @@ public class ItemWalkieTalkie extends ItemMekanism implements IItemNetwork return CHANNEL_MODELS.get(channel); } + @Nonnull @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { ItemStack itemStack = player.getHeldItem(hand); @@ -67,7 +70,7 @@ public class ItemWalkieTalkie extends ItemMekanism implements IItemNetwork } @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) + public boolean shouldCauseReequipAnimation(ItemStack oldStack, @Nonnull ItemStack newStack, boolean slotChanged) { return !ItemStack.areItemsEqual(oldStack, newStack); } diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index e99291b3a..544ccaa4e 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public abstract class UpdateProtocol> { @@ -64,8 +63,6 @@ public abstract class UpdateProtocol> { if(isViableNode(origX+1, origY, origZ)) { - xmin = 0; - while(isViableNode(origX+x+1, origY, origZ)) { x++; @@ -74,8 +71,6 @@ public abstract class UpdateProtocol> xmax = x; } else { - xmax = 0; - while(isViableNode(origX+x-1, origY, origZ)) { x--; @@ -536,7 +531,7 @@ public abstract class UpdateProtocol> //TODO seriously this needs to happen soon //TODO perhaps drop from pointer? - cache.apply((T)structureFound); + cache.apply(structureFound); structureFound.inventoryID = idToUse; onFormed(); diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 455bd6271..122d6f8d3 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -2,8 +2,6 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 384e113b0..fcd5551ab 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -2,8 +2,6 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.Mekanism; diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 2ccf4f761..d68597fa2 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -2,8 +2,6 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.client.gui.GuiDigitalMiner; import mekanism.client.gui.GuiDigitalMinerConfig; @@ -48,7 +46,7 @@ public class PacketDigitalMinerGui implements IMessageHandler { - if(worldServer != null) - { - if(message.type == 0 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) - { - TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter) message.coord4D.getTileEntity(worldServer); + if(message.type == 0 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) + { + TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter) message.coord4D.getTileEntity(worldServer); - if(!sorter.filters.contains(message.tFilter)) - { - return; - } + if(!sorter.filters.contains(message.tFilter)) + { + return; + } - int index = sorter.filters.indexOf(message.tFilter); + int index = sorter.filters.indexOf(message.tFilter); - sorter.filters.remove(index); + sorter.filters.remove(index); - if(!message.delete) - { - sorter.filters.add(index, message.tEdited); - } + if(!message.delete) + { + sorter.filters.add(index, message.tEdited); + } - for(EntityPlayer iterPlayer : sorter.playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(sorter), sorter.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); - } - } - else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) - { - TileEntityDigitalMiner miner = (TileEntityDigitalMiner)message.coord4D.getTileEntity(worldServer); + for(EntityPlayer iterPlayer : sorter.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(sorter), sorter.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); + } + } + else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) + { + TileEntityDigitalMiner miner = (TileEntityDigitalMiner)message.coord4D.getTileEntity(worldServer); - if(!miner.filters.contains(message.mFilter)) - { - return; - } + if(!miner.filters.contains(message.mFilter)) + { + return; + } - int index = miner.filters.indexOf(message.mFilter); + int index = miner.filters.indexOf(message.mFilter); - miner.filters.remove(index); + miner.filters.remove(index); - if(!message.delete) - { - miner.filters.add(index, message.mEdited); - } + if(!message.delete) + { + miner.filters.add(index, message.mEdited); + } - for(EntityPlayer iterPlayer : miner.playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(miner), miner.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); - } - } - else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) - { - TileEntityOredictionificator oredictionificator = (TileEntityOredictionificator)message.coord4D.getTileEntity(worldServer); + for(EntityPlayer iterPlayer : miner.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(miner), miner.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); + } + } + else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) + { + TileEntityOredictionificator oredictionificator = (TileEntityOredictionificator)message.coord4D.getTileEntity(worldServer); - if(!oredictionificator.filters.contains(message.oFilter)) - { - return; - } + if(!oredictionificator.filters.contains(message.oFilter)) + { + return; + } - int index = oredictionificator.filters.indexOf(message.oFilter); + int index = oredictionificator.filters.indexOf(message.oFilter); - oredictionificator.filters.remove(index); + oredictionificator.filters.remove(index); - if(!message.delete) - { - oredictionificator.filters.add(index, message.oEdited); - } + if(!message.delete) + { + oredictionificator.filters.add(index, message.oEdited); + } - for(EntityPlayer iterPlayer : oredictionificator.playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(oredictionificator), oredictionificator.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); - } - } - } - }); + for(EntityPlayer iterPlayer : oredictionificator.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(oredictionificator), oredictionificator.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); + } + } + }); return null; } diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index 932d603d6..c6b676bb4 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -41,7 +41,7 @@ public class PacketLogisticalSorterGui implements IMessageHandler { - if(worldServer != null) - { - if(message.type == 0 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) - { - TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter)message.coord4D.getTileEntity(worldServer); + if(message.type == 0 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) + { + TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter)message.coord4D.getTileEntity(worldServer); - sorter.filters.add(message.tFilter); + sorter.filters.add(message.tFilter); - for(EntityPlayer iterPlayer : sorter.playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(sorter), sorter.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); - } - } - else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) - { - TileEntityDigitalMiner miner = (TileEntityDigitalMiner)message.coord4D.getTileEntity(worldServer); + for(EntityPlayer iterPlayer : sorter.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(sorter), sorter.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); + } + } + else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) + { + TileEntityDigitalMiner miner = (TileEntityDigitalMiner)message.coord4D.getTileEntity(worldServer); - miner.filters.add(message.mFilter); + miner.filters.add(message.mFilter); - for(EntityPlayer iterPlayer : miner.playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(miner), miner.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); - } - } - else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) - { - TileEntityOredictionificator oredictionificator = (TileEntityOredictionificator)message.coord4D.getTileEntity(worldServer); + for(EntityPlayer iterPlayer : miner.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(miner), miner.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); + } + } + else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) + { + TileEntityOredictionificator oredictionificator = (TileEntityOredictionificator)message.coord4D.getTileEntity(worldServer); - oredictionificator.filters.add(message.oFilter); + oredictionificator.filters.add(message.oFilter); - for(EntityPlayer iterPlayer : oredictionificator.playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(oredictionificator), oredictionificator.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); - } - } - } - }); + for(EntityPlayer iterPlayer : oredictionificator.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(oredictionificator), oredictionificator.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); + } + } + }); return null; } diff --git a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java index 856600590..5ab142498 100644 --- a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java +++ b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java @@ -2,8 +2,6 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.client.gui.GuiOredictionificator; import mekanism.client.gui.GuiOredictionificatorFilter; @@ -42,7 +40,7 @@ public class PacketOredictionificatorGui implements IMessageHandler { + ItemStack itemstack = player.getHeldItem(message.currentHand); + World world = player.world; + + if(!itemstack.isEmpty() && itemstack.getItem() instanceof ItemPortableTeleporter) { - ItemStack itemstack = player.getHeldItem(message.currentHand); - World world = player.world; - - if(!itemstack.isEmpty() && itemstack.getItem() instanceof ItemPortableTeleporter) + ItemPortableTeleporter item = (ItemPortableTeleporter)itemstack.getItem(); + + switch(message.packetType) { - ItemPortableTeleporter item = (ItemPortableTeleporter)itemstack.getItem(); - - switch(message.packetType) - { - case DATA_REQUEST: - sendDataResponse(message.frequency, world, player, item, itemstack, message.currentHand); - break; - case DATA_RESPONSE: - Mekanism.proxy.handleTeleporterUpdate(message); - break; - case SET_FREQ: - FrequencyManager manager1 = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); - Frequency toUse = null; - - for(Frequency freq : manager1.getFrequencies()) - { - if(freq.name.equals(message.frequency.name)) - { - toUse = freq; - break; - } - } - - if(toUse == null) - { - toUse = new Frequency(message.frequency.name, player.getPersistentID()).setPublic(message.frequency.isPublic()); - manager1.addFrequency(toUse); - } - - item.setFrequency(itemstack, toUse); - - sendDataResponse(toUse, world, player, item, itemstack, message.currentHand); - - break; - case DEL_FREQ: - FrequencyManager manager = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); - manager.remove(message.frequency.name, player.getUniqueID()); - - item.setFrequency(itemstack, null); - - break; - case TELEPORT: - FrequencyManager manager2 = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); - Frequency found = null; - - for(Frequency freq : manager2.getFrequencies()) - { - if(message.frequency.name.equals(freq.name)) - { - found = freq; - break; - } - } - - if(found == null) + case DATA_REQUEST: + sendDataResponse(message.frequency, world, player, item, itemstack, message.currentHand); + break; + case DATA_RESPONSE: + Mekanism.proxy.handleTeleporterUpdate(message); + break; + case SET_FREQ: + FrequencyManager manager1 = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); + Frequency toUse = null; + + for(Frequency freq : manager1.getFrequencies()) + { + if(freq.name.equals(message.frequency.name)) { + toUse = freq; break; } - - Coord4D coords = found.getClosestCoords(new Coord4D(player)); - - if(coords != null) + } + + if(toUse == null) + { + toUse = new Frequency(message.frequency.name, player.getPersistentID()).setPublic(message.frequency.isPublic()); + manager1.addFrequency(toUse); + } + + item.setFrequency(itemstack, toUse); + + sendDataResponse(toUse, world, player, item, itemstack, message.currentHand); + + break; + case DEL_FREQ: + FrequencyManager manager = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); + manager.remove(message.frequency.name, player.getUniqueID()); + + item.setFrequency(itemstack, null); + + break; + case TELEPORT: + FrequencyManager manager2 = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); + Frequency found = null; + + for(Frequency freq : manager2.getFrequencies()) + { + if(message.frequency.name.equals(freq.name)) { - World teleWorld = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(coords.dimensionId); - TileEntityTeleporter teleporter = (TileEntityTeleporter)coords.getTileEntity(teleWorld); - - if(teleporter != null) - { - try { - teleporter.didTeleport.add(player.getPersistentID()); - teleporter.teleDelay = 5; - - item.setEnergy(itemstack, item.getEnergy(itemstack) - item.calculateEnergyCost(player, coords)); - - if(player instanceof EntityPlayerMP) - { - ((EntityPlayerMP)player).connection.floatingTickCount = 0; - } - - player.closeScreen(); - - Mekanism.packetHandler.sendToAllAround(new PortalFXMessage(new Coord4D(player)), coords.getTargetPoint(40D)); - TileEntityTeleporter.teleportPlayerTo((EntityPlayerMP)player, coords, teleporter); - TileEntityTeleporter.alignPlayer((EntityPlayerMP)player, coords); - - world.playSound(player, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1.0F, 1.0F); - Mekanism.packetHandler.sendToReceivers(new PortalFXMessage(coords), new Range4D(coords)); - } catch(Exception e) {} - } + found = freq; + break; } - + } + + if(found == null) + { break; - } + } + + Coord4D coords = found.getClosestCoords(new Coord4D(player)); + + if(coords != null) + { + World teleWorld = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(coords.dimensionId); + TileEntityTeleporter teleporter = (TileEntityTeleporter)coords.getTileEntity(teleWorld); + + if(teleporter != null) + { + try { + teleporter.didTeleport.add(player.getPersistentID()); + teleporter.teleDelay = 5; + + item.setEnergy(itemstack, item.getEnergy(itemstack) - ItemPortableTeleporter.calculateEnergyCost(player, coords)); + + if(player instanceof EntityPlayerMP) + { + ((EntityPlayerMP)player).connection.floatingTickCount = 0; + } + + player.closeScreen(); + + Mekanism.packetHandler.sendToAllAround(new PortalFXMessage(new Coord4D(player)), coords.getTargetPoint(40D)); + if(player instanceof EntityPlayerMP) { + TileEntityTeleporter.teleportPlayerTo((EntityPlayerMP) player, coords, teleporter); + TileEntityTeleporter.alignPlayer((EntityPlayerMP) player, coords); + } + + world.playSound(player, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1.0F, 1.0F); + Mekanism.packetHandler.sendToReceivers(new PortalFXMessage(coords), new Range4D(coords)); + } catch(Exception ignored) {} + } + } + + break; } } }, player); @@ -147,13 +145,10 @@ public class PacketPortableTeleporter implements IMessageHandler publicFreqs = new ArrayList<>(); - publicFreqs.addAll(getManager(null, world).getFrequencies()); - - List privateFreqs = new ArrayList<>(); + List publicFreqs = new ArrayList<>(getManager(null, world).getFrequencies()); - privateFreqs.addAll(getManager(player.getUniqueID(), world).getFrequencies()); + List privateFreqs = new ArrayList<>(getManager(player.getUniqueID(), world).getFrequencies()); byte status = 3; diff --git a/src/main/java/mekanism/common/network/PacketSimpleGui.java b/src/main/java/mekanism/common/network/PacketSimpleGui.java index f65325f2a..cf35a7adb 100644 --- a/src/main/java/mekanism/common/network/PacketSimpleGui.java +++ b/src/main/java/mekanism/common/network/PacketSimpleGui.java @@ -37,7 +37,7 @@ public class PacketSimpleGui implements IMessageHandler implements IRecipe { private static boolean registered; @@ -34,7 +36,7 @@ public class BinRecipe extends IForgeRegistryEntry.Impl implements IRec } @Override - public boolean matches(InventoryCrafting inv, World world) + public boolean matches(@Nonnull InventoryCrafting inv, @Nonnull World world) { return !getCraftingResult(inv).isEmpty(); } @@ -49,8 +51,9 @@ public class BinRecipe extends IForgeRegistryEntry.Impl implements IRec return BasicBlockType.get(itemStack) == BasicBlockType.BIN && itemStack.getCount() <= 1; } + @Nonnull @Override - public ItemStack getCraftingResult(InventoryCrafting inv) + public ItemStack getCraftingResult(@Nonnull InventoryCrafting inv) { return getResult(inv); } @@ -117,12 +120,14 @@ public class BinRecipe extends IForgeRegistryEntry.Impl implements IRec } } + @Nonnull @Override public ItemStack getRecipeOutput() { return ItemStack.EMPTY; } + @Nonnull @Override public NonNullList getRemainingItems(InventoryCrafting inv) { diff --git a/src/main/java/mekanism/common/recipe/MekanismIngredient.java b/src/main/java/mekanism/common/recipe/MekanismIngredient.java index cdf45255f..0f7ccad6d 100644 --- a/src/main/java/mekanism/common/recipe/MekanismIngredient.java +++ b/src/main/java/mekanism/common/recipe/MekanismIngredient.java @@ -28,6 +28,7 @@ public class MekanismIngredient extends Ingredient return RecipeUtils.areItemsEqualForCrafting(this.stack, input); } + @Nonnull public static Ingredient fromStacks(ItemStack... stacks) { if (stacks.length > 0) diff --git a/src/main/java/mekanism/common/recipe/MultiOredictIngredient.java b/src/main/java/mekanism/common/recipe/MultiOredictIngredient.java index 21b7134d6..7a3588a30 100644 --- a/src/main/java/mekanism/common/recipe/MultiOredictIngredient.java +++ b/src/main/java/mekanism/common/recipe/MultiOredictIngredient.java @@ -48,7 +48,7 @@ public class MultiOredictIngredient extends CompoundIngredient } ArrayList ores = new ArrayList<>(oreJsonArray.size()); oreJsonArray.forEach(el->ores.add(el.getAsString())); - return new MultiOredictIngredient(ores.toArray(new String[ores.size()])); + return new MultiOredictIngredient(ores.toArray(new String[0])); } } } diff --git a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java index 50906acbd..e53994be3 100644 --- a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java +++ b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java @@ -215,10 +215,7 @@ public class RecipeGenerator { Map ret = new HashMap<>(); //Filter circuits as they could be disabled -> Redirect the actual value to _constants.json with #OREDICTNAME - if(oredict != null && (oredict.equals("circuitBasic") || - oredict.equals("circuitAdvanced") || - oredict.equals("circuitElite") || - oredict.equals("circuitUltimate"))) + if(oredict.equals("circuitBasic") || oredict.equals("circuitAdvanced") || oredict.equals("circuitElite") || oredict.equals("circuitUltimate")) { ret.put("item", "#" + oredict.toUpperCase()); } diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java index dad821ceb..781bfb5d3 100644 --- a/src/main/java/mekanism/common/security/SecurityFrequency.java +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -2,7 +2,6 @@ package mekanism.common.security; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.UUID; import mekanism.common.HashList; diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index fd24bff1a..57b43d7ab 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -25,6 +25,8 @@ import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; +import javax.annotation.Nonnull; + @InterfaceList({ @Interface(iface = "cofh.redstoneflux.api.IEnergyProvider", modid = MekanismHooks.REDSTONEFLUX_MOD_ID), @Interface(iface = "cofh.redstoneflux.api.IEnergyReceiver", modid = MekanismHooks.REDSTONEFLUX_MOD_ID), @@ -56,6 +58,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return inv.getSizeInventory(); } + @Nonnull @Override public ItemStack getStackInSlot(int i) { @@ -68,6 +71,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return inv.getStackInSlot(i); } + @Nonnull @Override public ItemStack decrStackSize(int i, int j) { @@ -80,6 +84,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return inv.decrStackSize(i, j); } + @Nonnull @Override public ItemStack removeStackFromSlot(int i) { @@ -93,7 +98,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public void setInventorySlotContents(int i, ItemStack itemstack) + public void setInventorySlotContents(int i, @Nonnull ItemStack itemstack) { IAdvancedBoundingBlock inv = getInv(); if(inv == null) @@ -104,6 +109,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp inv.setInventorySlotContents(i, itemstack); } + @Nonnull @Override public String getName() { @@ -128,6 +134,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return inv.hasCustomName(); } + @Nonnull @Override public ITextComponent getDisplayName() { @@ -147,7 +154,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public boolean isUsableByPlayer(EntityPlayer entityplayer) + public boolean isUsableByPlayer(@Nonnull EntityPlayer entityplayer) { IAdvancedBoundingBlock inv = getInv(); if(inv == null) @@ -159,7 +166,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public void openInventory(EntityPlayer player) + public void openInventory(@Nonnull EntityPlayer player) { IAdvancedBoundingBlock inv = getInv(); if(inv == null) @@ -171,7 +178,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public void closeInventory(EntityPlayer player) + public void closeInventory(@Nonnull EntityPlayer player) { IAdvancedBoundingBlock inv = getInv(); if(inv == null) @@ -183,7 +190,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) + public boolean isItemValidForSlot(int i, @Nonnull ItemStack itemstack) { IAdvancedBoundingBlock inv = getInv(); if(inv == null) @@ -215,8 +222,9 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public void clear() {} + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { IAdvancedBoundingBlock inv = getInv(); if(inv == null) @@ -228,13 +236,13 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing side) + public boolean canInsertItem(int i, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return isItemValidForSlot(i, itemstack); } @Override - public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int i, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { IAdvancedBoundingBlock inv = getInv(); if(inv == null) @@ -478,7 +486,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { if (capability == Capabilities.TILE_NETWORK_CAPABILITY) { @@ -495,7 +503,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if (capability == Capabilities.TILE_NETWORK_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 9a52ca705..176ac30e5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.Range4D; @@ -43,6 +41,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import javax.annotation.Nonnull; + public class TileEntityBin extends TileEntityBasicBlock implements ISidedInventory, IActiveState, IConfigurable, ITierUpgradeable { public boolean isActive; @@ -288,6 +288,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -373,6 +374,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } } + @Nonnull @Override public ItemStack getStackInSlot(int slotID) { @@ -385,6 +387,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } } + @Nonnull @Override public ItemStack decrStackSize(int slotID, int amount) { @@ -410,6 +413,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento return ItemStack.EMPTY; } + @Nonnull @Override public ItemStack removeStackFromSlot(int slotID) { @@ -423,7 +427,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public void setInventorySlotContents(int i, ItemStack itemstack) + public void setInventorySlotContents(int i, @Nonnull ItemStack itemstack) { if(i == 0) { @@ -502,6 +506,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento markDirty(); } + @Nonnull @Override public String getName() { @@ -514,6 +519,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento return true; } + @Nonnull @Override public ITextComponent getDisplayName() { @@ -527,19 +533,19 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public boolean isUsableByPlayer(EntityPlayer entityplayer) + public boolean isUsableByPlayer(@Nonnull EntityPlayer entityplayer) { return true; } @Override - public void openInventory(EntityPlayer player) {} + public void openInventory(@Nonnull EntityPlayer player) {} @Override - public void closeInventory(EntityPlayer player) {} + public void closeInventory(@Nonnull EntityPlayer player) {} @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) + public boolean isItemValidForSlot(int i, @Nonnull ItemStack itemstack) { return i == 1 && isValid(itemstack); } @@ -571,8 +577,9 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento @Override public void clear() {} + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == EnumFacing.UP) { @@ -587,13 +594,13 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing side) + public boolean canInsertItem(int i, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return isItemValidForSlot(i, itemstack); } @Override - public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int i, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return i == 0 && isValid(itemstack); } @@ -691,13 +698,13 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIGURABLE_CAPABILITY) { @@ -737,6 +744,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento return 1; } + @Nonnull @Override public ItemStack getStackInSlot(int slot) { @@ -748,8 +756,9 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento return MekanismUtils.size(tileEntityBin.itemType, tileEntityBin.getItemCount()); } + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { if(slot != 0) { @@ -759,6 +768,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento return tileEntityBin.add(stack, simulate); } + @Nonnull public ItemStack extractItem(int slot, int amount, boolean simulate) { if(slot != 0) diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index c586b288a..5bf75f58b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -31,6 +30,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityBoilerCasing extends TileEntityMultiblock implements IHeatTransfer { /** A client-sided set of valves on this tank's structure that are currently active, used on the client for rendering fluids. */ @@ -413,13 +414,13 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { @@ -428,7 +429,8 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { @@ -204,7 +206,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 256f62d43..b85c7b24d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; @@ -20,6 +18,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nonnull; + public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { public BlockPos mainPos = BlockPos.ORIGIN; @@ -101,6 +101,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork receivedCoords = nbtTags.getBoolean("receivedCoords"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -127,13 +128,13 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == Capabilities.TILE_NETWORK_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java b/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java index c23bace87..caa14cd5c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java +++ b/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java @@ -4,6 +4,8 @@ import mekanism.common.block.BlockCardboardBox.BlockData; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import javax.annotation.Nonnull; + public class TileEntityCardboardBox extends TileEntity { public BlockData storedData; @@ -19,6 +21,7 @@ public class TileEntityCardboardBox extends TileEntity } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index 29ce25706..41ba16d4a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -21,6 +21,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; + public abstract class TileEntityChanceMachine> extends TileEntityBasicMachine { public TileEntityChanceMachine(String soundPath, String name, double maxEnergy, double baseEnergyUsage, int ticksRequired, ResourceLocation location) @@ -87,7 +89,7 @@ public abstract class TileEntityChanceMachine capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == Capabilities.CONFIG_CARD_CAPABILITY) @@ -278,7 +279,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityOperationalMachine } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -294,7 +295,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityOperationalMachine } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 0) { @@ -312,8 +313,9 @@ public class TileEntityChemicalCrystallizer extends TileEntityOperationalMachine return false; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 92065ad15..e85253865 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -133,7 +133,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityMachine impl } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 1) { @@ -148,7 +148,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityMachine impl } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 2) { @@ -158,8 +158,9 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityMachine impl return false; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == MekanismUtils.getLeft(facing) || side == EnumFacing.UP) { @@ -283,6 +284,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityMachine impl outputTank.read(nbtTags.getCompoundTag("gasTank")); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -344,14 +346,14 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityMachine impl } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index c3ad728c6..3394ad97b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -254,6 +254,7 @@ public class TileEntityChemicalInfuser extends TileEntityMachine implements IGas centerTank.read(nbtTags.getCompoundTag("centerTank")); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -338,14 +339,14 @@ public class TileEntityChemicalInfuser extends TileEntityMachine implements IGas } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { @@ -356,13 +357,13 @@ public class TileEntityChemicalInfuser extends TileEntityMachine implements IGas } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { return slotID == 3 && ChargeUtils.canBeDischarged(itemstack); } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 0 || slotID == 2) { @@ -380,8 +381,9 @@ public class TileEntityChemicalInfuser extends TileEntityMachine implements IGas return false; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == MekanismUtils.getLeft(facing)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index a250b5825..d30bd1e09 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -31,6 +31,8 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine implements ITubeConnection, ISustainedData, ITankManager { public GasTank gasTank = new GasTank(MAX_GAS); @@ -98,7 +100,7 @@ public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine imp } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -113,7 +115,7 @@ public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine imp } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 2) { @@ -123,8 +125,9 @@ public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine imp return false; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == MekanismUtils.getLeft(facing)) { @@ -214,6 +217,7 @@ public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine imp gasTank.read(nbtTags.getCompoundTag("gasTank")); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -237,13 +241,13 @@ public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine imp } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.TUBE_CONNECTION_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 66de979c7..2660a0a73 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -262,6 +262,7 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH outputTank.read(nbtTags.getCompoundTag("centerTank")); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -348,7 +349,7 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -363,7 +364,7 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 1) { @@ -377,8 +378,9 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH return false; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == MekanismUtils.getLeft(facing)) { @@ -397,14 +399,14 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 519560553..974def9d2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.BitSet; import java.util.HashMap; import java.util.HashSet; @@ -74,6 +73,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityDigitalMiner extends TileEntityElectricBlock implements IUpgradeTile, IRedstoneControl, IActiveState, ISustainedData, IChunkLoader, IAdvancedBoundingBlock { public static int[] EJECT_INV; @@ -227,7 +228,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I Block block = state.getBlock(); int meta = block.getMetaFromState(state); - if(block == null || coord.isAirBlock(world)) + if(coord.isAirBlock(world)) { set.clear(index); @@ -495,18 +496,13 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { stack = stack.copy(); - if(stack.isEmpty() || stack.getItem() == null) + if(stack.isEmpty()) { continue; } for(int i = 0; i < 27; i++) { - if(!testInv.get(i).isEmpty() && testInv.get(i).getItem() == null) - { - testInv.set(i, ItemStack.EMPTY); - } - if(testInv.get(i).isEmpty()) { testInv.set(i, stack); @@ -639,7 +635,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public void openInventory(EntityPlayer player) + public void openInventory(@Nonnull EntityPlayer player) { super.openInventory(player); @@ -679,6 +675,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -1117,6 +1114,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return false; } + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() @@ -1167,8 +1165,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return InventoryUtils.EMPTY; } @@ -1274,8 +1273,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public Object[] invoke(int method, Object[] arguments) throws Exception - { + public Object[] invoke(int method, Object[] arguments) { if(method == 0) { if(arguments.length != 1 || !(arguments[0] instanceof Double)) @@ -1518,7 +1516,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I for(int i = 0; i < tagList.tagCount(); i++) { - filters.add(MinerFilter.readFromNBT((NBTTagCompound)tagList.getCompoundTagAt(i))); + filters.add(MinerFilter.readFromNBT(tagList.getCompoundTagAt(i))); } } } @@ -1573,7 +1571,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY || super.hasCapability(capability, side); @@ -1581,7 +1579,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override @SuppressWarnings("unchecked") - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 37cf8473c..70dc7d68b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java index cd5ee7c75..f22aafcd2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java @@ -12,6 +12,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import javax.annotation.Nonnull; + public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFluidHandlerWrapper { public DynamicFluidTank fluidTank; @@ -76,7 +78,8 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl { return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)); } - + + @Nonnull @Override public String getName() { @@ -84,7 +87,7 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { @@ -98,7 +101,7 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 85d4b552f..2ea8fffe5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -56,6 +56,8 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; +import javax.annotation.Nonnull; + public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandlerWrapper, ISustainedTank, IConfigurable, IRedstoneControl, IUpgradeTile, ITankManager, IComputerIntegration, ISecurityTile { /** This pump's tank */ @@ -155,7 +157,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { TileEntity tileEntity = Coord4D.get(this).offset(EnumFacing.UP).getTileEntity(world); - if(tileEntity != null && CapabilityUtils.hasCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN)) + if(CapabilityUtils.hasCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN)) { IFluidHandler handler = CapabilityUtils.getCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN); FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(256*(upgradeComponent.getUpgrades(Upgrade.SPEED)+1), fluidTank.getFluidAmount())); @@ -171,7 +173,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I public boolean suck(boolean take) { - List tempPumpList = Arrays.asList(recurringNodes.toArray(new Coord4D[recurringNodes.size()])); + List tempPumpList = Arrays.asList(recurringNodes.toArray(new Coord4D[0])); Collections.shuffle(tempPumpList); //First see if there are any fluid blocks touching the pump - if so, sucks and adds the location to the recurring list @@ -309,6 +311,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I return data; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -381,7 +384,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 1) { @@ -400,7 +403,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 2) { @@ -426,8 +429,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I return side != 0 && side != 1; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == EnumFacing.UP) { @@ -534,14 +538,14 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIGURABLE_CAPABILITY) { @@ -598,14 +602,11 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I @Override public Object[] invoke(int method, Object[] arguments) throws Exception { - switch(method) - { - case 0: - reset(); - return new Object[] {"Pump calculation reset."}; - default: - throw new NoSuchMethodException(); + if (method == 0) { + reset(); + return new Object[]{"Pump calculation reset."}; } + throw new NoSuchMethodException(); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 26df3dd62..bf838cab2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -251,7 +251,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 3) { @@ -271,7 +271,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -293,8 +293,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement return true; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == MekanismUtils.getRight(facing)) { @@ -426,6 +427,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement dumpRight = GasMode.values()[nbtTags.getInteger("dumpRight")]; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -613,14 +615,14 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { @@ -652,15 +654,10 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement { super.recalculateUpgradables(upgrade); - switch(upgrade) - { - case ENERGY: - maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY); - energyPerTick = BlockStateMachine.MachineType.ELECTROLYTIC_SEPARATOR.getUsage(); - setEnergy(Math.min(getMaxEnergy(), getEnergy())); - break; - default: - break; + if (upgrade == Upgrade.ENERGY) { + maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY); + energyPerTick = BlockStateMachine.MachineType.ELECTROLYTIC_SEPARATOR.getUsage(); + setEnergy(Math.min(getMaxEnergy(), getEnergy())); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java index 97201676f..7266b55ca 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java @@ -1,6 +1,5 @@ package mekanism.common.tile; -import java.util.HashMap; import java.util.Map; import mekanism.common.block.states.BlockStateMachine; @@ -8,10 +7,7 @@ import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SmeltingRecipe; -import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.tile.prefab.TileEntityElectricMachine; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; public class TileEntityEnergizedSmelter extends TileEntityElectricMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 0fda9d2be..96ece31cb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess; @@ -38,6 +36,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityEnergyCube extends TileEntityElectricBlock implements IComputerIntegration, IRedstoneControl, ISideConfiguration, ISecurityTile, ITierUpgradeable, IConfigCardAccess { /** This Energy Cube's tier. */ @@ -123,6 +123,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo return true; } + @Nonnull @Override public String getName() { @@ -141,7 +142,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -179,14 +180,15 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo return tier.maxEnergy; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 1) { @@ -265,6 +267,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -344,13 +347,13 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIG_CARD_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index e54a63f42..b2a9213fb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -19,7 +19,6 @@ import mekanism.api.gas.ITubeConnection; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.transmitters.TransmissionType; -import mekanism.client.HolidayManager; import mekanism.common.InfuseStorage; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -67,8 +66,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; @@ -82,7 +79,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt public int BASE_MAX_INFUSE = 1000; - public int maxInfuse = BASE_MAX_INFUSE; + public int maxInfuse; /** How many ticks it takes, by default, to run an operation. */ public int BASE_TICKS_REQUIRED = 200; @@ -536,7 +533,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 1) { @@ -559,7 +556,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(tier == FactoryTier.BASIC) { @@ -834,6 +831,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt gasTank.read(nbtTags.getCompoundTag("gasTank")); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -913,7 +911,8 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt { return 5+tier.processes+operation; } - + + @Nonnull @Override public String getName() { @@ -985,8 +984,9 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } @@ -1068,7 +1068,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY @@ -1076,7 +1076,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 1dca645d2..45316e325 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.Range4D; @@ -52,6 +50,8 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandlerWrapper, ISustainedTank, IFluidContainerManager, ITankManager, ISecurityTile, ITierUpgradeable { public boolean isActive; @@ -189,7 +189,8 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc needsPacket = false; } } - + + @Nonnull @Override public String getName() { @@ -202,7 +203,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { TileEntity tileEntity = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(world); - if(tileEntity != null && CapabilityUtils.hasCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP)) + if(CapabilityUtils.hasCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP)) { IFluidHandler handler = CapabilityUtils.getCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP); FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(tier.output, fluidTank.getFluidAmount())); @@ -261,13 +262,13 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return slotID == 1; } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -280,8 +281,9 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc return false; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == EnumFacing.DOWN) { @@ -295,6 +297,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc return InventoryUtils.EMPTY; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -484,14 +487,14 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIGURABLE_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 7f7afb4e1..ba102b922 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -52,6 +52,8 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; +import javax.annotation.Nonnull; + public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandlerWrapper, ISustainedTank, IUpgradeTile, IRedstoneControl, ISecurityTile { public Set activeNodes = new LinkedHashSet<>(); @@ -266,6 +268,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen return data; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -345,7 +348,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 1) { @@ -364,7 +367,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 2) { @@ -390,8 +393,9 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen return side != 0 && side != 1; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == EnumFacing.UP) { @@ -500,14 +504,14 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIGURABLE_CAPABILITY) { @@ -533,18 +537,15 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen @Override public Object[] invoke(int method, Object[] arguments) throws Exception { - switch(method) - { - case 0: - activeNodes.clear(); - usedNodes.clear(); - finishedCalc = false; + if (method == 0) { + activeNodes.clear(); + usedNodes.clear(); + finishedCalc = false; - return new Object[]{"Plenisher calculation reset."}; - default: - throw new NoSuchMethodException(); - } - } + return new Object[]{"Plenisher calculation reset."}; + } + throw new NoSuchMethodException(); + } @Override public TileComponentUpgrade getComponent() diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index a8e091361..2ba6d62a3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -37,6 +37,8 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { public InventoryCrafting dummyInv = MekanismUtils.getDummyCraftingInv(); @@ -546,15 +548,16 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { return side != 0 && side != 1; } - + + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 1) { @@ -569,7 +572,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID >= 3 && slotID <= 20) { @@ -625,6 +628,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im stockControl = nbtTags.getBoolean("stockControl"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -828,13 +832,13 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIG_CARD_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 44d4c6d7e..4223bcf62 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; @@ -28,6 +26,8 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implements IHeatTransfer, ISecurityTile, IActiveState { public double temperature; @@ -133,6 +133,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement maxBurnTime = nbtTags.getInteger("maxBurnTime"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -189,9 +190,10 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement { return side != 0 && side != 1; } - + + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return new int[] {0}; } @@ -287,13 +289,13 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 79e1c80c9..22cc1409a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; @@ -178,7 +176,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH return true; } - + + @Nonnull @Override public String getName() { @@ -186,7 +185,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 1) { @@ -202,7 +201,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -216,8 +215,9 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH return false; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } @@ -273,14 +273,14 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { @@ -350,6 +350,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { diff --git a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java index 117a3b866..0981dca62 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java +++ b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java @@ -19,6 +19,8 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.property.IExtendedBlockState; +import javax.annotation.Nonnull; + public class TileEntityGlowPanel extends TileEntity implements ITileNetwork { public EnumColor colour = EnumColor.WHITE; @@ -35,8 +37,7 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork } @Override - public void handlePacketData(ByteBuf dataStream) throws Exception - { + public void handlePacketData(ByteBuf dataStream) { side = EnumFacing.byIndex(dataStream.readInt()); colour = EnumColor.DYES[dataStream.readInt()]; @@ -68,6 +69,7 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbt) { @@ -78,7 +80,8 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork return nbt; } - + + @Nonnull @Override public NBTTagCompound getUpdateTag() { @@ -95,13 +98,13 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == Capabilities.TILE_NETWORK_CAPABILITY) return (T)this; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 35a4178c7..45ddc0616 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; @@ -26,6 +24,8 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityInductionCasing extends TileEntityMultiblock implements IStrictEnergyStorage, IComputerIntegration { public int clientCells; @@ -149,7 +149,8 @@ public class TileEntityInductionCasing extends TileEntityMultiblock capability, net.minecraft.util.EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, net.minecraft.util.EnumFacing facing) { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + public T getCapability(@Nonnull Capability capability, net.minecraft.util.EnumFacing facing) { if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY) return (T) this; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index 1c5524386..6c4fead6a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -13,6 +13,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityInductionCell extends TileEntityBasicBlock implements IStrictEnergyStorage { public InductionCellTier tier = InductionCellTier.BASIC; @@ -68,6 +70,7 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt electricityStored = nbtTags.getDouble("electricityStored"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -98,13 +101,13 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt } @Override - public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) + public boolean hasCapability(@Nonnull net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + public T getCapability(@Nonnull Capability capability, net.minecraft.util.EnumFacing facing) { if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY) return (T) this; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index a5c8a9f40..123c18573 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -9,8 +9,6 @@ import ic2.api.energy.tile.IEnergyEmitter; import ic2.api.energy.tile.IEnergyTile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; @@ -44,6 +42,8 @@ import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; +import javax.annotation.Nonnull; + @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = MekanismHooks.IC2_MOD_ID), @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = MekanismHooks.IC2_MOD_ID), @@ -108,12 +108,11 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement if(registered != this) { - if(registered instanceof IEnergyTile) + if(registered != null) { MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(registered)); } - else if(registered == null) - { + else { MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); ic2Registered = true; } @@ -128,7 +127,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement { IEnergyTile registered = EnergyNet.instance.getTile(world, getPos()); - if(registered instanceof IEnergyTile) + if(registered != null) { MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(registered)); } @@ -214,6 +213,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement mode = nbtTags.getBoolean("mode"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -500,7 +500,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY @@ -517,7 +517,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, ForgeEnergyIntegration.class); @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY) diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java index 314571371..ea08ec2ff 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java @@ -10,6 +10,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityInductionProvider extends TileEntityBasicBlock { public InductionProviderTier tier = InductionProviderTier.BASIC; @@ -57,6 +59,7 @@ public class TileEntityInductionProvider extends TileEntityBasicBlock tier = InductionProviderTier.values()[nbtTags.getInteger("tier")]; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index a325037dd..72813534c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.LaserManager; @@ -25,6 +23,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveState { public Coord4D digging; @@ -188,6 +188,7 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat isActive = nbtTags.getBoolean("isActive"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 7f6b2eff1..e42f32b1c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyStorage; @@ -33,6 +31,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, IStrictEnergyOutputter, IStrictEnergyStorage, IComputerIntegration, ISecurityTile { public static final double MAX_ENERGY = 5E9; @@ -317,6 +317,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement outputMode = RedstoneOutput.values()[nbtTags.getInteger("outputMode")]; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -393,7 +394,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY @@ -402,7 +403,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY) return (T)this; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 033d926cc..ffd16c9a5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; @@ -29,6 +28,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor, ISecurityTile { public static final double MAX_ENERGY = 5E9; @@ -197,13 +198,14 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme } @Override - public boolean canInsertItem(int i, ItemStack itemStack, EnumFacing side) + public boolean canInsertItem(int i, @Nonnull ItemStack itemStack, @Nonnull EnumFacing side) { return false; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return availableSlotIDs; } @@ -240,13 +242,13 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.LASER_RECEPTOR_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.LASER_RECEPTOR_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index e0f2a241a..def946e1c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Iterator; import mekanism.api.Coord4D; @@ -53,6 +52,8 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData, ISecurityTile, IComputerIntegration { public HashList filters = new HashList<>(); @@ -118,7 +119,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(invStack == null || invStack.getStack().isEmpty()) { - break inner; + break; } if(filter.canFilter(invStack.getStack(), true)) @@ -194,6 +195,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -461,13 +463,13 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return false; } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { return false; } @@ -478,8 +480,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen return 1; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == facing || side == facing.getOpposite()) { @@ -490,7 +493,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public void openInventory(EntityPlayer player) + public void openInventory(@Nonnull EntityPlayer player) { if(!world.isRemote) { @@ -692,8 +695,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public Object[] invoke(int method, Object[] arguments) throws Exception - { + public Object[] invoke(int method, Object[] arguments) { if(arguments.length > 0) { if(method == 0) @@ -746,11 +748,6 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen TItemStackFilter filter = new TItemStackFilter(); filter.itemType = new ItemStack(Item.getByNameOrId((String)arguments[0]), 1, ((Double)arguments[1]).intValue()); - - if(filter.itemType.getItem() == null) - { - return new Object[] {"Invalid item type."}; - } filter.color = EnumColor.getFromDyeName((String)arguments[2]); filter.sizeMode = (Boolean)arguments[3]; @@ -837,14 +834,14 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 38c7db19d..1ae0c5339 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -41,6 +41,8 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine implements IComputerIntegration, ISideConfiguration, IConfigCardAccess, ITierUpgradeable, ISustainedData { /** The maxiumum amount of infuse this machine can store. */ @@ -206,7 +208,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 4) { @@ -221,7 +223,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 3) { @@ -296,6 +298,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i infuseStored.type = InfuseRegistry.get(nbtTags.getString("type")); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -386,8 +389,9 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i } } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } @@ -417,13 +421,13 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIG_CARD_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 5499b52f1..4dc4aa065 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; @@ -30,6 +28,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public abstract class TileEntityMultiblock> extends TileEntityContainerBlock implements IMultiblock { /** The multiblock data for this structure. */ @@ -266,6 +266,7 @@ public abstract class TileEntityMultiblock> extend } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -291,7 +292,8 @@ public abstract class TileEntityMultiblock> extend { return false; } - + + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 32ac29a91..d775adc82 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -37,6 +36,8 @@ import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nonnull; + public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData, ISecurityTile { public static final int MAX_LENGTH = 24; @@ -156,9 +157,10 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple return ItemStack.EMPTY; } - + + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == MekanismUtils.getLeft(facing)) { @@ -174,18 +176,19 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return slotID == 1; } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { return slotID == 0 && !getResult(itemstack).isEmpty(); } - + + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -325,7 +328,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public void openInventory(EntityPlayer player) + public void openInventory(@Nonnull EntityPlayer player) { if(!world.isRemote) { @@ -435,14 +438,14 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index d48ae81ab..47af10584 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -147,7 +147,7 @@ public class TileEntityPRC extends TileEntityBasicMachine capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java index 12bea361b..c68a4eb76 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java @@ -12,6 +12,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraftforge.fml.relauncher.Side; +import javax.annotation.Nonnull; + public class TileEntityPersonalChest extends TileEntityContainerBlock implements ISecurityTile { public static int[] INV; @@ -73,13 +75,14 @@ public class TileEntityPersonalChest extends TileEntityContainerBlock implements } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { return true; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(side == EnumFacing.DOWN || SecurityUtils.getSecurity(this, Side.SERVER) != SecurityMode.PUBLIC) { @@ -101,7 +104,7 @@ public class TileEntityPersonalChest extends TileEntityContainerBlock implements } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 67ec4ec09..5eca60282 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -282,6 +282,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -656,13 +657,14 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canInsertItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canInsertItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState == IOState.INPUT; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { if(hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState != IOState.OFF) { @@ -673,7 +675,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState == IOState.OUTPUT; } @@ -720,7 +722,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == Capabilities.HEAT_TRANSFER_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY @@ -728,7 +730,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == Capabilities.HEAT_TRANSFER_CAPABILITY) @@ -755,23 +757,19 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public Object[] invoke(int method, Object[] arguments) throws Exception { - switch(method) - { - case 0: - if(!(arguments[0] instanceof String) || !(arguments[1] instanceof Boolean)) - { - return new Object[] {"Invalid parameters."}; - } - - String freq = ((String)arguments[0]).trim(); - boolean isPublic = (Boolean)arguments[1]; - - setFrequency(freq, isPublic); - - return new Object[] {"Frequency set."}; - default: - throw new NoSuchMethodException(); + if (method == 0) { + if (!(arguments[0] instanceof String) || !(arguments[1] instanceof Boolean)) { + return new Object[]{"Invalid parameters."}; + } + + String freq = ((String) arguments[0]).trim(); + boolean isPublic = (Boolean) arguments[1]; + + setFrequency(freq, isPublic); + + return new Object[]{"Frequency set."}; } + throw new NoSuchMethodException(); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 235b78fe7..44843c92a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -28,6 +28,8 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl, ISecurityTile { public double energyUsage = 100; @@ -153,6 +155,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I maxEnergy = energyUsage * 400; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -275,13 +278,13 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 93418a5df..2a25fa237 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; @@ -277,6 +276,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -331,14 +331,14 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index 3bbf97a9a..8402e712e 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -28,6 +28,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntitySecurityDesk extends TileEntityContainerBlock implements IBoundingBlock { public UUID ownerUUID; @@ -233,6 +235,7 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -321,7 +324,8 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements return null; } - + + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 81574627b..37c028ded 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; @@ -29,6 +27,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile, IBoundingBlock { public boolean isActive; @@ -112,7 +112,8 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement Mekanism.activeVibrators.remove(Coord4D.get(this)); } - + + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -244,7 +245,8 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement world.setBlockToAir(getPos().up()); world.setBlockToAir(getPos()); } - + + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 9fec6fcc4..9750fdfb4 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; @@ -261,6 +260,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im outputTank.read(nbtTags.getCompoundTag("outputTank")); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -342,14 +342,14 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { @@ -454,7 +454,8 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im { return upgrade == Upgrade.SPEED ? upgrade.getExpScaledInfo(this) : upgrade.getMultScaledInfo(this); } - + + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index 03b0bf063..90c104ee4 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index c9fd8f0b8..9f6190a97 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -58,6 +58,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityTeleporter extends TileEntityElectricBlock implements IComputerIntegration, IChunkLoader, IFrequencyHandler, IRedstoneControl, ISecurityTile, IUpgradeTile { private MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); @@ -278,14 +280,15 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return new int[] {0}; } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -555,6 +558,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -681,7 +685,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return ChargeUtils.canBeOutputted(itemstack, false); } @@ -725,6 +729,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } } + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java index 057485e6d..8ef26c735 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java @@ -64,7 +64,7 @@ public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock if(tile != null) { - ((TileEntityThermalEvaporationController)tile).refresh(); + tile.refresh(); } } } @@ -80,7 +80,7 @@ public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock if(tile != null) { - ((TileEntityThermalEvaporationController)tile).refresh(); + tile.refresh(); } else { updateController(); diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 8e6a8ec0e..bd7b0868a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -41,6 +40,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityThermalEvaporationController extends TileEntityThermalEvaporationBlock implements IActiveState, ITankManager { public static final int MAX_OUTPUT = 10000; @@ -655,6 +656,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva partialOutput = nbtTags.getDouble("partialBrine"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -698,7 +700,8 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva tankParts.clear(); solars = new IEvaporationSolar[] {null, null, null, null}; } - + + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index 86ac61cab..cf69d8179 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -14,6 +14,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import javax.annotation.Nonnull; + public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporationBlock implements IFluidHandlerWrapper, IHeatTransfer { public boolean prevMaster = false; @@ -162,7 +164,7 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && getController() != null) || @@ -170,7 +172,7 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java index 2042a09db..7e21a26c9 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java @@ -254,7 +254,7 @@ public abstract class TileEntityAdvancedElectricMachine capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java index c2ac66683..f3754cd61 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java @@ -36,6 +36,8 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; +import javax.annotation.Nonnull; + @Interface(iface = "ic2.api.tile.IWrenchable", modid = MekanismHooks.IC2_MOD_ID) public abstract class TileEntityBasicBlock extends TileEntity implements ITileNetwork, IChunkLoadHandler, IFrequencyHandler, ITickable { @@ -199,6 +201,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -220,13 +223,13 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == Capabilities.TILE_NETWORK_CAPABILITY) return (T)this; @@ -309,7 +312,8 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe return null; } - + + @Nonnull @Override public NBTTagCompound getUpdateTag() { @@ -319,7 +323,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe } @Override - public void handleUpdateTag(NBTTagCompound tag) + public void handleUpdateTag(@Nonnull NBTTagCompound tag) { // The super implementation of handleUpdateTag is to call this readFromNBT. But, the given TagCompound // only has x/y/z/id data, so our readFromNBT will set a bunch of default values which are wrong. diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java index aa6e23401..88d3db12b 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java @@ -15,6 +15,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nonnull; + public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityOperationalMachine implements IElectricMachine, IComputerIntegration, ISideConfiguration, IConfigCardAccess { public ResourceLocation guiLocation; @@ -44,8 +46,9 @@ public abstract class TileEntityBasicMachine, return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } @@ -69,13 +72,13 @@ public abstract class TileEntityBasicMachine, } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.CONFIG_CARD_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java index 8be6b8d4f..0be3a459a 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java @@ -79,6 +79,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -117,12 +118,14 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl return getInventory() != null ? getInventory().size() : 0; } + @Nonnull @Override public ItemStack getStackInSlot(int slotID) { return getInventory() != null ? getInventory().get(slotID) : ItemStack.EMPTY; } + @Nonnull @Override public ItemStack decrStackSize(int slotID, int amount) { @@ -134,6 +137,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl return ItemStackHelper.getAndSplit(getInventory(), slotID, amount); } + @Nonnull @Override public ItemStack removeStackFromSlot(int slotID) { @@ -146,7 +150,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public void setInventorySlotContents(int slotID, ItemStack itemstack) + public void setInventorySlotContents(int slotID, @Nonnull ItemStack itemstack) { getInventory().set(slotID, itemstack); @@ -159,11 +163,12 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public boolean isUsableByPlayer(EntityPlayer entityplayer) + public boolean isUsableByPlayer(@Nonnull EntityPlayer entityplayer) { return !isInvalid() && this.world.isBlockLoaded(this.pos);//prevent Containers from remaining valid after the chunk has unloaded; } + @Nonnull @Override public String getName() { @@ -177,10 +182,10 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public void openInventory(EntityPlayer player) {} + public void openInventory(@Nonnull EntityPlayer player) {} @Override - public void closeInventory(EntityPlayer player) {} + public void closeInventory(@Nonnull EntityPlayer player) {} @Override public boolean hasCustomName() @@ -189,25 +194,26 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { return true; } @Override - public boolean canInsertItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canInsertItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return isItemValidForSlot(slotID, itemstack); } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return InventoryUtils.EMPTY; } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { return true; } @@ -224,7 +230,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl for(int slots = 0; slots < nbtTags.tagCount(); slots++) { - NBTTagCompound tagCompound = (NBTTagCompound)nbtTags.getCompoundTagAt(slots); + NBTTagCompound tagCompound = nbtTags.getCompoundTagAt(slots); byte slotID = tagCompound.getByte("Slot"); if(slotID >= 0 && slotID < inventory.size()) @@ -281,6 +287,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl @Override public void clear() {} + @Nonnull @Override public ITextComponent getDisplayName() { @@ -288,7 +295,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } @@ -321,7 +328,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl }; @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityDoubleElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityDoubleElectricMachine.java index 27761d903..6304cfa09 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityDoubleElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityDoubleElectricMachine.java @@ -24,6 +24,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; + public abstract class TileEntityDoubleElectricMachine> extends TileEntityBasicMachine implements ITierUpgradeable { /** @@ -163,7 +165,7 @@ public abstract class TileEntityDoubleElectricMachine capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY @@ -427,7 +428,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, ForgeEnergyIntegration.class); @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY) diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java index 52e84997f..ce2146912 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java @@ -24,6 +24,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; + public abstract class TileEntityElectricMachine> extends TileEntityBasicMachine implements ITierUpgradeable { /** @@ -162,7 +164,7 @@ public abstract class TileEntityElectricMachine { public Tier.TransporterTier tier = Tier.TransporterTier.BASIC; @@ -316,6 +317,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index 8f84993b9..1beecbb8d 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -27,6 +27,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import javax.annotation.Nonnull; + public class TileEntityMechanicalPipe extends TileEntityTransmitter implements IFluidHandlerWrapper { public Tier.PipeTier tier = Tier.PipeTier.BASIC; @@ -150,6 +152,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @@ -344,7 +347,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter manager = new CapabilityWrapperManager<>(IFluidHandlerWrapper.class, FluidHandlerWrapper.class); @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java index 2e7406a54..91d64f73f 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java @@ -158,6 +158,7 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index 09477e8c0..7aadd0071 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -53,6 +53,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; + public abstract class TileEntitySidedPipe extends TileEntity implements ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable { public int delayTicks; @@ -147,7 +149,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet { TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side)); - if(tileEntity != null && CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) && TransmissionType.checkTransmissionType(CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()), getTransmitterType().getTransmission()) && isValidTransmitter(tileEntity)) { @@ -406,6 +408,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -420,7 +423,8 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet return nbtTags; } - + + @Nonnull @Override public NBTTagCompound getUpdateTag() { @@ -712,14 +716,14 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == Capabilities.TILE_NETWORK_CAPABILITY || capability == Capabilities.BLOCKABLE_CONNECTION_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == Capabilities.TILE_NETWORK_CAPABILITY || capability == Capabilities.BLOCKABLE_CONNECTION_CAPABILITY) diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java index f3ca64f50..688482bb7 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java @@ -2,7 +2,6 @@ package mekanism.common.tile.transmitter; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Collection; import mekanism.api.Coord4D; @@ -26,6 +25,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nonnull; + public class TileEntityThermodynamicConductor extends TileEntityTransmitter implements IHeatTransfer { public Tier.ConductorTier tier = Tier.ConductorTier.BASIC; @@ -109,6 +110,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java index 8d116bafb..e19febd42 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java @@ -20,6 +20,8 @@ import net.minecraft.util.EnumHand; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nonnull; + public abstract class TileEntityTransmitter> extends TileEntitySidedPipe implements IAlloyInteraction { public TransmitterImpl transmitterDelegate; @@ -206,14 +208,14 @@ public abstract class TileEntityTransmitter> e public abstract void updateShare(); @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GRID_TRANSMITTER_CAPABILITY || capability == Capabilities.ALLOY_INTERACTION_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY) { diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index d85556666..1450b0a70 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -39,6 +39,8 @@ import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.common.Optional; +import javax.annotation.Nonnull; + @Optional.InterfaceList( @Optional.Interface(iface = "cofh.redstoneflux.api.IEnergyReceiver", modid = MekanismHooks.REDSTONEFLUX_MOD_ID) ) @@ -107,14 +109,14 @@ public class TileEntityUniversalCable extends TileEntityTransmitter 0) { toDraw -= takeEnergy(toDraw, true); } - producer.takePower((long)Math.round(toDraw*general.TO_TESLA), false); + producer.takePower(Math.round(toDraw*general.TO_TESLA), false); } else if(MekanismUtils.useForge() && CapabilityUtils.hasCapability(outputter, CapabilityEnergy.ENERGY, side.getOpposite())) @@ -208,6 +210,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter capability, EnumFacing facing) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing facing) { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY @@ -430,7 +433,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter T getCapability(Capability capability, EnumFacing facing) + public T getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) { diff --git a/src/main/java/mekanism/common/transmitters/TransporterImpl.java b/src/main/java/mekanism/common/transmitters/TransporterImpl.java index 564ccd948..becee0447 100644 --- a/src/main/java/mekanism/common/transmitters/TransporterImpl.java +++ b/src/main/java/mekanism/common/transmitters/TransporterImpl.java @@ -111,7 +111,7 @@ public class TransporterImpl extends TransmitterImpl> availableAcceptors = new ArrayList<>(); - availableAcceptors.addAll(getAcceptors(null)); + List> availableAcceptors = new ArrayList<>(getAcceptors(null)); Collections.shuffle(availableAcceptors); diff --git a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java index ccd3395d5..46e96e751 100644 --- a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java @@ -140,8 +140,7 @@ public class FluidNetwork extends DynamicNetwork public int tickEmit(FluidStack fluidToSend, boolean doTransfer) { - List> availableAcceptors = new ArrayList<>(); - availableAcceptors.addAll(getAcceptors(fluidToSend)); + List> availableAcceptors = new ArrayList<>(getAcceptors(fluidToSend)); Collections.shuffle(availableAcceptors); @@ -169,7 +168,7 @@ public class FluidNetwork extends DynamicNetwork { int prev = fluidSent; - if(acceptor != null && fluidToSend != null) + if(acceptor != null) { fluidSent += acceptor.fill(PipeUtils.copy(fluidToSend, currentSending), doTransfer); } @@ -379,6 +378,6 @@ public class FluidNetwork extends DynamicNetwork @Override public String getFlowInfo() { - return Integer.toString(prevTransferAmount) + " mB/t"; + return prevTransferAmount + " mB/t"; } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java b/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java index 5a49bd8d8..a372f309b 100644 --- a/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java @@ -372,6 +372,6 @@ public class GasNetwork extends DynamicNetwork @Override public String getFlowInfo() { - return Integer.toString(prevTransferAmount) + "/t"; + return prevTransferAmount + "/t"; } } diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 6d28e7e94..e46b14b7f 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -28,7 +28,7 @@ public final class CableUtils { public static boolean isCable(TileEntity tileEntity) { - if(tileEntity != null && CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { return TransmissionType.checkTransmissionType(CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null), TransmissionType.ENERGY); } @@ -265,7 +265,7 @@ public final class CableUtils else if(MekanismUtils.useTesla() && CapabilityUtils.hasCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite())) { ITeslaConsumer consumer = CapabilityUtils.getCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite()); - sent += consumer.givePower((long)Math.round(currentSending*general.TO_TESLA), false)*general.FROM_TESLA; + sent += consumer.givePower(Math.round(currentSending*general.TO_TESLA), false)*general.FROM_TESLA; } else if(MekanismUtils.useForge() && CapabilityUtils.hasCapability(tileEntity, CapabilityEnergy.ENERGY, side.getOpposite())) { diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index a6791bbe9..0a93a1326 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -41,7 +41,7 @@ public final class ChargeUtils { ITeslaProducer producer = stack.getCapability(Capabilities.TESLA_PRODUCER_CAPABILITY, null); - long needed = (long)Math.round((storer.getMaxEnergy()-storer.getEnergy())*general.TO_TESLA); + long needed = Math.round((storer.getMaxEnergy()-storer.getEnergy())*general.TO_TESLA); storer.setEnergy(storer.getEnergy() + producer.takePower(needed, false)*general.FROM_TESLA); } else if(MekanismUtils.useForge() && stack.hasCapability(CapabilityEnergy.ENERGY, null)) @@ -99,7 +99,7 @@ public final class ChargeUtils { ITeslaConsumer consumer = stack.getCapability(Capabilities.TESLA_CONSUMER_CAPABILITY, null); - long stored = (long)Math.round(storer.getEnergy()*general.TO_TESLA); + long stored = Math.round(storer.getEnergy()*general.TO_TESLA); storer.setEnergy(storer.getEnergy() - consumer.givePower(stored, false)*general.FROM_TESLA); } else if(MekanismUtils.useForge() && stack.hasCapability(CapabilityEnergy.ENERGY, null)) diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index a2135a673..74f0fc108 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -214,7 +214,7 @@ public final class FluidContainerUtils { return handleContainerItemFill(tileEntity, inventory, stack, inSlot, outSlot); } - else if(editMode == ContainerEditMode.EMPTY || (editMode == ContainerEditMode.BOTH && fluidStack != null)) + else if(editMode == ContainerEditMode.EMPTY || editMode == ContainerEditMode.BOTH) { return handleContainerItemEmpty(tileEntity, inventory, stack, needed, inSlot, outSlot, checker); } diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index f711f7589..7659abc5f 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -9,7 +9,7 @@ public class HeatUtils { public static double[] simulate(IHeatTransfer source) { - double heatTransferred[] = new double[] {0, 0}; + double[] heatTransferred = new double[] {0, 0}; for(EnumFacing side : EnumFacing.VALUES) { diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index 773589d08..eca57e250 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -87,7 +87,7 @@ public final class InventoryUtils ISidedInventory sidedInventory = (ISidedInventory)tile; int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - if(slots != null && slots.length != 0) + if(slots.length != 0) { if(force && sidedInventory instanceof TileEntityBin && side == EnumFacing.UP) { @@ -307,7 +307,7 @@ public final class InventoryUtils ISidedInventory sidedInventory = (ISidedInventory)tile; int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - if(slots != null && slots.length != 0) + if(slots.length != 0) { for(int get = slots.length - 1; get >= 0; get--) { @@ -374,7 +374,7 @@ public final class InventoryUtils } } - if(ret != null && !ret.getStack().isEmpty() && ret.getStack().getCount() >= min) + if(!ret.getStack().isEmpty() && ret.getStack().getCount() >= min) { return ret; } @@ -420,7 +420,7 @@ public final class InventoryUtils ISidedInventory sidedInventory = (ISidedInventory)tileEntity; int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - if(slots != null && slots.length != 0) + if(slots.length != 0) { if(force && sidedInventory instanceof TileEntityBin && side == EnumFacing.UP) { diff --git a/src/main/java/mekanism/common/util/ItemRegistryUtils.java b/src/main/java/mekanism/common/util/ItemRegistryUtils.java index 4210ba9bc..e1c1dc98f 100644 --- a/src/main/java/mekanism/common/util/ItemRegistryUtils.java +++ b/src/main/java/mekanism/common/util/ItemRegistryUtils.java @@ -27,7 +27,7 @@ public final class ItemRegistryUtils /* Mod ID lookup thanks to JEI */ public static String getMod(ItemStack stack) { - if(stack.isEmpty() || stack.getItem() == null) + if(stack.isEmpty()) { return "null"; } diff --git a/src/main/java/mekanism/common/util/ListUtils.java b/src/main/java/mekanism/common/util/ListUtils.java index 526a5fd9a..99f8211e7 100644 --- a/src/main/java/mekanism/common/util/ListUtils.java +++ b/src/main/java/mekanism/common/util/ListUtils.java @@ -49,9 +49,8 @@ public class ListUtils public static List copy(List list) { - List toReturn = new ArrayList<>(); - toReturn.addAll(list); + List toReturn = new ArrayList<>(list); return toReturn; } @@ -150,7 +149,7 @@ public class ListUtils public static List asList(V... values) { - return (List)Arrays.asList(values); + return Arrays.asList(values); } public static ArrayList asArrayList(V... values) diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index d201009e8..883b05cf7 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -160,7 +160,7 @@ public final class MekanismUtils Mekanism.logger.info("Minecraft is in offline mode, could not check for updates."); } } - } catch(Exception e) {} + } catch(Exception ignored) {} return false; } @@ -873,11 +873,6 @@ public final class MekanismUtils IBlockState state = pos.getBlockState(world); Block block = state.getBlock(); - if(block == null) - { - return null; - } - if((block == Blocks.WATER || block == Blocks.FLOWING_WATER) && state.getValue(BlockLiquid.LEVEL) == 0) { if(!filter) @@ -916,7 +911,7 @@ public final class MekanismUtils IBlockState state = pos.getBlockState(world); Block block = state.getBlock(); - if(block == null || block.getMetaFromState(state) == 0) + if(block.getMetaFromState(state) == 0) { return false; } @@ -1344,7 +1339,7 @@ public final class MekanismUtils { Container tempContainer = new Container() { @Override - public boolean canInteractWith(EntityPlayer player) + public boolean canInteractWith(@Nonnull EntityPlayer player) { return false; } @@ -1378,7 +1373,7 @@ public final class MekanismUtils } } - if((dmgItems.get(0).isEmpty()) || (dmgItems.get(0).getItem() == null)) + if(dmgItems.get(0).isEmpty()) { return ItemStack.EMPTY; } @@ -1535,7 +1530,7 @@ public final class MekanismUtils { return true; } - } catch(Throwable t) {} + } catch(Throwable ignored) {} return false; } diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 8cb11c293..1c7d9b44d 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -4,7 +4,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import mekanism.api.Coord4D; @@ -38,7 +37,7 @@ public final class MinerUtils IBlockState state = obj.getBlockState(world); Block block = state.getBlock(); - if(block == null || block.isAir(state, world, obj.getPos())) + if(block.isAir(state, world, obj.getPos())) { return Collections.EMPTY_LIST; } @@ -51,10 +50,10 @@ public final class MinerUtils try { Object it = getSilkTouchDrop.invoke(block, state); - if (it != null && it instanceof ItemStack && !((ItemStack)it).isEmpty()) + if (it instanceof ItemStack && !((ItemStack) it).isEmpty()) { ret.add((ItemStack)it); - } else if (it != null && it instanceof ItemStack && ((ItemStack)it).isEmpty()){//silk touch drop is empty, fallback to grabbing an itemblock + } else if (it instanceof ItemStack && ((ItemStack) it).isEmpty()){//silk touch drop is empty, fallback to grabbing an itemblock fallbackGetSilkTouch(block, state, ret); } } catch (InvocationTargetException|IllegalAccessException e){ @@ -89,7 +88,7 @@ public final class MinerUtils private static void fallbackGetSilkTouch(Block block, IBlockState state, List ret){ Item item = Item.getItemFromBlock(block); - if (item != null && item != Items.AIR) + if (item != Items.AIR) { int meta = item.getHasSubtypes() ? block.getMetaFromState(state) : 0; ret.add(new ItemStack(item, 1, meta)); diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index ccc5862fb..975a3ea59 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -69,7 +69,7 @@ public final class PipeUtils { TileEntity acceptor = world.getTileEntity(pos.offset(orientation)); - if(acceptor != null && CapabilityUtils.hasCapability(acceptor, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, orientation.getOpposite())) + if(CapabilityUtils.hasCapability(acceptor, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, orientation.getOpposite())) { IFluidHandler handler = CapabilityUtils.getCapability(acceptor, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, orientation.getOpposite()); acceptors[orientation.ordinal()] = handler; diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index eae7057af..235746509 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -34,7 +34,7 @@ public class RecipeUtils { return false; } - else if(target.isEmpty() && input.isEmpty()) + else if(target.isEmpty()) { return true; } @@ -273,21 +273,17 @@ public class RecipeUtils } else if(nbtTags.hasKey("itemname")) { - Object obj = Item.REGISTRY.getObject(new ResourceLocation(nbtTags.getString("itemname"))); + Item item = Item.REGISTRY.getObject(new ResourceLocation(nbtTags.getString("itemname"))); - if(obj != null) + if(item != null) { - return new ItemStack((Item)obj, amount, meta); + return new ItemStack(item, amount, meta); } } else if(nbtTags.hasKey("blockname")) { - Object obj = Block.REGISTRY.getObject(new ResourceLocation(nbtTags.getString("blockname"))); - - if(obj != null) - { - return new ItemStack((Block)obj, amount, meta); - } + Block block = Block.REGISTRY.getObject(new ResourceLocation(nbtTags.getString("blockname"))); + return new ItemStack(block, amount, meta); } return ItemStack.EMPTY; diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index 8594b62a1..fb77f7e18 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -46,7 +46,7 @@ public final class SecurityUtils public static boolean canAccess(EntityPlayer player, TileEntity tile) { - if(tile == null || !(tile instanceof ISecurityTile)) + if(!(tile instanceof ISecurityTile)) { return true; } diff --git a/src/main/java/mekanism/common/util/StackUtils.java b/src/main/java/mekanism/common/util/StackUtils.java index d928cc2da..d39f2c094 100644 --- a/src/main/java/mekanism/common/util/StackUtils.java +++ b/src/main/java/mekanism/common/util/StackUtils.java @@ -247,7 +247,7 @@ public final class StackUtils public static int hashItemStack(ItemStack stack) { - if(stack.isEmpty() || stack.getItem() == null) + if(stack.isEmpty()) { return -1; } diff --git a/src/main/java/mekanism/common/util/TextComponentGroup.java b/src/main/java/mekanism/common/util/TextComponentGroup.java index 915637252..30d45afc1 100644 --- a/src/main/java/mekanism/common/util/TextComponentGroup.java +++ b/src/main/java/mekanism/common/util/TextComponentGroup.java @@ -5,6 +5,8 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; +import javax.annotation.Nonnull; + /** * Created by Thiakil on 8/11/2017. */ @@ -21,12 +23,14 @@ public class TextComponentGroup extends TextComponentString getStyle().setColor(color); } + @Nonnull @Override public String getUnformattedComponentText() { return ""; } + @Nonnull @Override public TextComponentGroup createCopy() { diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index 14dccd64e..8ec106cc0 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -42,7 +42,7 @@ public final class TransporterUtils int[] slots = ((ISidedInventory)inventory).getSlotsForFace(side.getOpposite()); - return (slots != null && slots.length > 0); + return slots.length > 0; } } else if(InventoryUtils.isItemHandler(tile, side.getOpposite())) diff --git a/src/main/java/mekanism/common/world/WorldGenSalt.java b/src/main/java/mekanism/common/world/WorldGenSalt.java index 9e76bbe6d..13e323241 100644 --- a/src/main/java/mekanism/common/world/WorldGenSalt.java +++ b/src/main/java/mekanism/common/world/WorldGenSalt.java @@ -10,6 +10,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import javax.annotation.Nonnull; + public class WorldGenSalt extends WorldGenerator { private Block blockGen; @@ -23,7 +25,7 @@ public class WorldGenSalt extends WorldGenerator } @Override - public boolean generate(World world, Random random, BlockPos pos) + public boolean generate(@Nonnull World world, @Nonnull Random random, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getMaterial() != Material.WATER) { diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 5b27dcdc1..e09530f6e 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -122,12 +122,8 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy for(String s : CUSTOM_RENDERS) { ModelResourceLocation model = new ModelResourceLocation("mekanismgenerators:" + s, "inventory"); - Object obj = event.getModelRegistry().getObject(model); - - if(obj instanceof IBakedModel) - { - event.getModelRegistry().putObject(model, new GeneratorItemModelFactory((IBakedModel)obj)); - } + IBakedModel bakedModel = event.getModelRegistry().getObject(model); + event.getModelRegistry().putObject(model, new GeneratorItemModelFactory(bakedModel)); } } diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java index a4de829aa..62adbf01d 100644 --- a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; @@ -31,6 +32,7 @@ import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -120,6 +122,7 @@ public class BakedGeneratorItemModel implements IBakedModel } } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { @@ -148,8 +151,8 @@ public class BakedGeneratorItemModel implements IBakedModel GlStateManager.popMatrix(); MekanismRenderer.resumeRenderer(tessellator); - - if(Block.getBlockFromItem(stack.getItem()) != null) + + if(Block.getBlockFromItem(stack.getItem()) != Blocks.AIR) { generalQuads.addAll(baseModel.getQuads(state, side, rand)); } @@ -175,20 +178,23 @@ public class BakedGeneratorItemModel implements IBakedModel return baseModel.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return baseModel.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return baseModel.getItemCameraTransforms(); } - + + @Nonnull @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + public Pair handlePerspective(@Nonnull ItemCameraTransforms.TransformType cameraTransformType) { prevTransform = cameraTransformType; @@ -216,6 +222,7 @@ public class BakedGeneratorItemModel implements IBakedModel null); } + @Nonnull @Override public ItemOverrideList getOverrides() { diff --git a/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java b/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java index 124e5fa8f..f703e6bb3 100644 --- a/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java +++ b/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java @@ -15,6 +15,8 @@ import net.minecraft.world.World; import com.google.common.collect.Lists; +import javax.annotation.Nonnull; + public class GeneratorItemModelFactory implements IBakedModel { private IBakedModel baseModel; @@ -25,13 +27,15 @@ public class GeneratorItemModelFactory implements IBakedModel { baseModel = base; } - + + @Nonnull @Override public ItemOverrideList getOverrides() { return override; } - + + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing facing, long rand) { @@ -56,12 +60,14 @@ public class GeneratorItemModelFactory implements IBakedModel throw new UnsupportedOperationException(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { throw new UnsupportedOperationException(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { @@ -75,8 +81,9 @@ public class GeneratorItemModelFactory implements IBakedModel super(Lists.newArrayList()); } + @Nonnull @Override - public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) + public IBakedModel handleItemState(@Nonnull IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { return new BakedGeneratorItemModel(baseModel, stack); } diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index e1410c4ba..b18f8f969 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -3,7 +3,6 @@ package mekanism.generators.common; import static java.lang.Math.max; import static java.lang.Math.min; -import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index 5abbee564..cd76edc23 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -16,7 +16,7 @@ import net.minecraftforge.registries.IForgeRegistry; public class GeneratorsItems { public static final Item SolarPanel = new ItemMekanism(); - public static final ItemHohlraum Hohlraum = (ItemHohlraum)new ItemHohlraum(); + public static final ItemHohlraum Hohlraum = new ItemHohlraum(); public static final Item TurbineBlade = new ItemMekanism() { @Override public boolean doesSneakBypassUse(ItemStack stack, IBlockAccess world, BlockPos pos, EntityPlayer player) diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index d6d5d7337..f49efd606 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -41,6 +41,7 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -61,7 +62,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import buildcraft.api.tools.IToolWrench; + +import javax.annotation.Nonnull; /** * Block class for handling multiple generator block IDs. @@ -109,13 +111,15 @@ public abstract class BlockGenerator extends BlockContainer } public abstract GeneratorBlock getGeneratorBlock(); - + + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateGenerator(this, getTypeProperty()); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -130,9 +134,10 @@ public abstract class BlockGenerator extends BlockContainer GeneratorType type = state.getValue(getTypeProperty()); return type.meta; } - + + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); @@ -241,7 +246,7 @@ public abstract class BlockGenerator extends BlockContainer } @Override - public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World world, BlockPos pos) + public float getPlayerRelativeBlockHardness(IBlockState state, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); @@ -339,7 +344,7 @@ public abstract class BlockGenerator extends BlockContainer } @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) + public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); @@ -430,7 +435,7 @@ public abstract class BlockGenerator extends BlockContainer { if(!stack.isEmpty() && stack.getItem() == GeneratorsItems.TurbineBlade) { - if(!world.isRemote && rod.editBlade(true)) + if(rod.editBlade(true)) { if(!entityplayer.capabilities.isCreativeMode) { @@ -446,40 +451,33 @@ public abstract class BlockGenerator extends BlockContainer return true; } } - else { - if(!world.isRemote) + else if(stack.isEmpty()) + { + if(rod.editBlade(false)) { - if(stack.isEmpty()) + if(!entityplayer.capabilities.isCreativeMode) { - if(rod.editBlade(false)) - { - if(!entityplayer.capabilities.isCreativeMode) - { - entityplayer.setHeldItem(hand, new ItemStack(GeneratorsItems.TurbineBlade)); - entityplayer.inventory.markDirty(); - } - } + entityplayer.setHeldItem(hand, new ItemStack(GeneratorsItems.TurbineBlade)); + entityplayer.inventory.markDirty(); } - else if(stack.getItem() == GeneratorsItems.TurbineBlade) + } + } + else if(stack.getItem() == GeneratorsItems.TurbineBlade) + { + if(stack.getCount() < stack.getMaxStackSize()) + { + if(rod.editBlade(false)) { - if(stack.getCount() < stack.getMaxStackSize()) + if(!entityplayer.capabilities.isCreativeMode) { - if(rod.editBlade(false)) - { - if(!entityplayer.capabilities.isCreativeMode) - { - stack.grow(1); - entityplayer.inventory.markDirty(); - } - } + stack.grow(1); + entityplayer.inventory.markDirty(); } } } - - return true; } - - return false; + + return true; } int guiId = GeneratorType.get(getGeneratorBlock(), metadata).guiId; @@ -510,7 +508,7 @@ public abstract class BlockGenerator extends BlockContainer } @Override - public TileEntity createTileEntity(World world, IBlockState state) + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { int metadata = state.getBlock().getMetaFromState(state); @@ -522,12 +520,14 @@ public abstract class BlockGenerator extends BlockContainer return GeneratorType.get(getGeneratorBlock(), metadata).create(); } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { - return null; + return Items.AIR; } - + + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { @@ -547,6 +547,7 @@ public abstract class BlockGenerator extends BlockContainer } @SideOnly(Side.CLIENT) + @Nonnull @Override public BlockRenderLayer getRenderLayer() { @@ -555,11 +556,12 @@ public abstract class BlockGenerator extends BlockContainer /*This method is not used, metadata manipulation is required to create a Tile Entity.*/ @Override - public TileEntity createNewTileEntity(World world, int meta) + public TileEntity createNewTileEntity(@Nonnull World world, int meta) { return null; } - + + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { @@ -577,7 +579,7 @@ public abstract class BlockGenerator extends BlockContainer } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -594,8 +596,9 @@ public abstract class BlockGenerator extends BlockContainer return world.setBlockToAir(pos); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, state.getBlock().getMetaFromState(state)); @@ -674,7 +677,7 @@ public abstract class BlockGenerator extends BlockContainer } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { GeneratorType type = GeneratorType.get(getGeneratorBlock(), state.getBlock().getMetaFromState(state)); @@ -690,7 +693,7 @@ public abstract class BlockGenerator extends BlockContainer } @Override - public EnumFacing[] getValidRotations(World world, BlockPos pos) + public EnumFacing[] getValidRotations(World world, @Nonnull BlockPos pos) { TileEntity tile = world.getTileEntity(pos); EnumFacing[] valid = new EnumFacing[6]; @@ -712,7 +715,7 @@ public abstract class BlockGenerator extends BlockContainer } @Override - public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) + public boolean rotateBlock(World world, @Nonnull BlockPos pos, @Nonnull EnumFacing axis) { TileEntity tile = world.getTileEntity(pos); @@ -736,7 +739,7 @@ public abstract class BlockGenerator extends BlockContainer } @Override - public boolean canCreatureSpawn(IBlockState state, IBlockAccess world, BlockPos pos, EntityLiving.SpawnPlacementType type) + public boolean canCreatureSpawn(@Nonnull IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EntityLiving.SpawnPlacementType type) { int meta = state.getBlock().getMetaFromState(state); diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index a0991b154..f2fe55524 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -38,6 +38,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import buildcraft.api.tools.IToolWrench; +import javax.annotation.Nonnull; + public abstract class BlockReactor extends Block implements ITileEntityProvider { @@ -62,9 +64,10 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider } public abstract ReactorBlock getReactorBlock(); - + + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); @@ -80,13 +83,15 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider return state; } - + + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateReactor(this, getTypeProperty()); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { @@ -184,7 +189,7 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider } @Override - public TileEntity createTileEntity(World world, IBlockState state) + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { int metadata = state.getBlock().getMetaFromState(state); @@ -195,13 +200,15 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider return ReactorBlockType.get(getReactorBlock(), metadata).create(); } - + + @Nonnull @Override public BlockRenderLayer getRenderLayer() { return this == GeneratorsBlocks.Reactor ? BlockRenderLayer.CUTOUT : BlockRenderLayer.TRANSLUCENT; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { @@ -222,14 +229,14 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider /*This method is not used, metadata manipulation is required to create a Tile Entity.*/ @Override - public TileEntity createNewTileEntity(World world, int meta) + public TileEntity createNewTileEntity(@Nonnull World world, int meta) { return null; } @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { int meta = state.getBlock().getMetaFromState(state); ReactorBlockType type = ReactorBlockType.get(getReactorBlock(), meta); @@ -263,7 +270,7 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { ReactorBlockType type = ReactorBlockType.get(getReactorBlock(), state.getBlock().getMetaFromState(state)); @@ -283,13 +290,10 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider { ReactorBlockType type = BlockStateReactor.ReactorBlockType.get(this, state.getBlock().getMetaFromState(state)); - switch(type) - { - case REACTOR_LOGIC_ADAPTER: - return true; - default: - return false; + if (type == ReactorBlockType.REACTOR_LOGIC_ADAPTER) { + return true; } + return false; } public ItemStack dismantleBlock(World world, BlockPos pos, boolean returnBlock) diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java index 7f6781258..705bd86b2 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -44,6 +44,8 @@ import net.minecraftforge.common.property.IUnlistedProperty; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import javax.annotation.Nonnull; + public class BlockStateGenerator extends ExtendedBlockState { public static final PropertyBool activeProperty = PropertyBool.create("active"); @@ -71,13 +73,10 @@ public class BlockStateGenerator extends ExtendedBlockState public Block getBlock() { - switch(this) - { - case GENERATOR_BLOCK_1: - return GeneratorsBlocks.Generator; - default: - return null; + if (this == GeneratorBlock.GENERATOR_BLOCK_1) { + return GeneratorsBlocks.Generator; } + return null; } } @@ -251,8 +250,9 @@ public class BlockStateGenerator extends ExtendedBlockState public static class GeneratorBlockStateMapper extends StateMapperBase { + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { BlockGenerator block = (BlockGenerator)state.getBlock(); GeneratorType type = state.getValue(block.getTypeProperty()); diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java index 0d15e013d..96515bccc 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java @@ -27,6 +27,7 @@ import net.minecraftforge.common.property.IUnlistedProperty; import com.google.common.base.Predicate; +import javax.annotation.Nonnull; import java.util.Locale; public class BlockStateReactor extends ExtendedBlockState @@ -174,8 +175,9 @@ public class BlockStateReactor extends ExtendedBlockState public static class ReactorBlockStateMapper extends StateMapperBase { + @Nonnull @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { BlockReactor block = (BlockReactor)state.getBlock(); ReactorBlockType type = state.getValue(block.getTypeProperty()); diff --git a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java index 3aef19f34..9b19637b7 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -62,7 +62,7 @@ public class SynchronizedTurbineData extends SynchronizedData list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { GeneratorType type = GeneratorType.get(itemstack); if (type==null) @@ -175,7 +178,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState state) { boolean place = true; Block block = world.getBlockState(pos).getBlock(); @@ -207,13 +210,12 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp return false; } - outer: for(int yPos = 1; yPos <= 4; yPos++) { if(!world.isAirBlock(pos.add(0, yPos, 0)) || pos.getY()+yPos > 255) { place = false; - break outer; + break; } } } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index d0912b7f7..37188f425 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -16,6 +16,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; +import javax.annotation.Nonnull; + public class ItemBlockReactor extends ItemBlock { public Block metaBlock; @@ -33,6 +35,7 @@ public class ItemBlockReactor extends ItemBlock return i; } + @Nonnull @Override public String getTranslationKey(ItemStack itemstack) { @@ -41,7 +44,7 @@ public class ItemBlockReactor extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) + public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { ReactorBlockType type = ReactorBlockType.get(itemstack); diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index 852655ff4..0101ee72b 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -20,6 +20,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemHohlraum extends ItemMekanism implements IGasItem { public static final int MAX_GAS = 10; @@ -122,7 +124,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem } @Override - public int getRGBDurabilityForDisplay(ItemStack stack) + public int getRGBDurabilityForDisplay(@Nonnull ItemStack stack) { return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } @@ -157,7 +159,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem } @Override - public void getSubItems(CreativeTabs tabs, NonNullList list) + public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { if(!isInCreativeTab(tabs)) return; ItemStack empty = new ItemStack(this); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 277aba7e5..9740b07ff 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -9,6 +9,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nonnull; + public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, IEvaporationSolar { public TileEntityAdvancedSolarGenerator() @@ -62,13 +64,13 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.EVAPORATION_SOLAR_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.EVAPORATION_SOLAR_CAPABILITY) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 0a4a9d280..c0f4f1e3a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -27,6 +27,8 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityBioGenerator extends TileEntityGenerator implements IFluidHandlerWrapper, ISustainedData { /** The FluidSlot biofuel instance for this generator. */ @@ -104,7 +106,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -149,6 +151,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui bioFuelSlot.fluidStored = nbtTags.getInteger("bioFuelStored"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -174,8 +177,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui return bioFuelSlot.fluidStored*i / bioFuelSlot.MAX_FLUID; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return side == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } @@ -309,13 +313,13 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return (side != facing && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(side != facing && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index c8c62c466..bf3c9ea64 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -156,7 +156,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 1) { @@ -171,7 +171,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -186,8 +186,9 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH return true; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return side == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } @@ -324,6 +325,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -359,14 +361,14 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 7d2d1ff28..ed3d57ebb 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -24,6 +24,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public abstract class TileEntityGenerator extends TileEntityNoisyBlock implements IComputerIntegration, IActiveState, IRedstoneControl, ISecurityTile { /** Output per tick this generator can transfer. */ @@ -193,6 +195,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -204,6 +207,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement return nbtTags; } + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 5e4b1ff51..e3ee3c3e6 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -36,6 +36,8 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityHeatGenerator extends TileEntityGenerator implements IFluidHandlerWrapper, ISustainedData, IHeatTransfer { /** The FluidTank for this generator. */ @@ -124,7 +126,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { @@ -155,6 +157,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -169,7 +172,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 1) { @@ -216,8 +219,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu return TileEntityFurnace.getItemBurnTime(itemstack)/2; } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return side == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } @@ -445,14 +449,14 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || (side != facing && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 311281f98..2879d7339 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -15,6 +15,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntitySolarGenerator extends TileEntityGenerator { /** Whether or not this generator sees the sun. */ @@ -35,8 +37,9 @@ public class TileEntitySolarGenerator extends TileEntityGenerator inventory = NonNullList.withSize(1, ItemStack.EMPTY); } + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return new int[] {0}; } @@ -88,7 +91,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(slotID == 0) { @@ -99,7 +102,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(slotID == 0) { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index edae96df4..43c540272 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -15,12 +15,10 @@ import mekanism.common.util.MekanismUtils; import mekanism.generators.common.FusionReactor; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; -import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fluids.Fluid; @@ -31,11 +29,13 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class TileEntityReactorController extends TileEntityReactorBlock implements IActiveState { public static final int MAX_WATER = 100 * Fluid.BUCKET_VOLUME; public static final int MAX_STEAM = MAX_WATER * 100; - public static final int MAX_FUEL = 1 * Fluid.BUCKET_VOLUME; + public static final int MAX_FUEL = Fluid.BUCKET_VOLUME; public FluidTank waterTank = new FluidTank(MAX_WATER); public FluidTank steamTank = new FluidTank(MAX_STEAM); @@ -170,6 +170,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen formMultiblock(false); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound tag) { @@ -256,11 +257,8 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { int type = dataStream.readInt(); - switch(type) - { - case 0: - if(getReactor() != null) getReactor().setInjectionRate(dataStream.readInt()); - break; + if (type == 0) { + if (getReactor() != null) getReactor().setInjectionRate(dataStream.readInt()); } return; @@ -274,7 +272,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen if(formed) { - if(getReactor() == null || !((FusionReactor)getReactor()).formed) + if(getReactor() == null || !getReactor().formed) { Mekanism.proxy.doGenericSparkle(this, tile -> tile instanceof TileEntityReactorBlock); } @@ -343,6 +341,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen return false; } + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java index c6bddd6f7..1aa7c15e2 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java @@ -5,6 +5,8 @@ import mekanism.common.capabilities.Capabilities; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nonnull; + public class TileEntityReactorLaserFocusMatrix extends TileEntityReactorBlock implements ILaserReceptor { @Override @@ -29,13 +31,13 @@ public class TileEntityReactorLaserFocusMatrix extends TileEntityReactorBlock im } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.LASER_RECEPTOR_CAPABILITY || super.hasCapability(capability, side); } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.LASER_RECEPTOR_CAPABILITY) { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index d48dc6213..ce1a24398 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -10,6 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implements IComputerIntegration { public ReactorLogic logicType = ReactorLogic.DISABLED; @@ -84,6 +86,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem activeCooled = nbtTags.getBoolean("activeCooled"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index f084440d7..49a9d7dd5 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -2,8 +2,6 @@ package mekanism.generators.common.tile.reactor; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; @@ -68,6 +66,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl fluidEject = nbtTags.getBoolean("fluidEject"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -236,7 +235,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == Capabilities.HEAT_TRANSFER_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY @@ -244,7 +243,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || capability == Capabilities.HEAT_TRANSFER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY) @@ -390,7 +389,8 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl return null; } - + + @Nonnull @Override public ItemStack getStackInSlot(int slotID) { @@ -404,7 +404,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public void setInventorySlotContents(int slotID, ItemStack itemstack) + public void setInventorySlotContents(int slotID, @Nonnull ItemStack itemstack) { if(getReactor() != null && getReactor().isFormed()) { @@ -416,15 +416,16 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } } } - + + @Nonnull @Override - public int[] getSlotsForFace(EnumFacing side) + public int[] getSlotsForFace(@Nonnull EnumFacing side) { return getReactor() != null && getReactor().isFormed() ? new int[] {0} : InventoryUtils.EMPTY; } @Override - public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, @Nonnull ItemStack itemstack) { if(getReactor() != null && getReactor().isFormed() && itemstack.getItem() instanceof ItemHohlraum) { @@ -437,7 +438,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) + public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if(getReactor() != null && getReactor().isFormed() && itemstack.getItem() instanceof ItemHohlraum) { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 330f6cb20..a4d234c89 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -2,8 +2,6 @@ package mekanism.generators.common.tile.turbine; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; @@ -31,6 +29,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nonnull; + public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage { public TileEntityTurbineCasing() @@ -122,7 +122,8 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock rotors = new ArrayList<>(); @@ -251,6 +253,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock blades = nbtTags.getInteger("blades"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { @@ -260,7 +263,8 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock return nbtTags; } - + + @Nonnull @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index 001b6ceda..554d00bb5 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -36,6 +36,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.Optional.Method; +import javax.annotation.Nonnull; + public class TileEntityTurbineValve extends TileEntityTurbineCasing implements IFluidHandlerWrapper, IEnergyWrapper, IComputerIntegration { public boolean ic2Registered = false; @@ -96,12 +98,11 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I if(registered != this) { - if(registered instanceof IEnergyTile) + if(registered != null) { MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(registered)); } - else if(registered == null) - { + else { MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); ic2Registered = true; } @@ -116,7 +117,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { IEnergyTile registered = EnergyNet.instance.getTile(world, getPos()); - if(registered instanceof IEnergyTile) + if(registered != null) { MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(registered)); } @@ -369,7 +370,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(resource == null || !canFill(from, resource != null ? resource.getFluid() : null)) + if(resource == null || !canFill(from, resource.getFluid())) { return 0; } @@ -417,7 +418,8 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { return false; } - + + @Nonnull @Override public String getName() { @@ -464,7 +466,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { @@ -486,7 +488,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, ForgeEnergyIntegration.class); @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java index 97aafbcad..3561536f7 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java @@ -15,6 +15,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import javax.annotation.Nonnull; + public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IFluidHandlerWrapper { public FluidTankInfo fakeInfo = new FluidTankInfo(null, 1000); @@ -37,7 +39,7 @@ public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IF { TileEntity tile = Coord4D.get(this).offset(side).getTileEntity(world); - if(tile != null && CapabilityUtils.hasCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite())) { IFluidHandler handler = CapabilityUtils.getCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite()); @@ -93,7 +95,7 @@ public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IF } @Override - public boolean hasCapability(Capability capability, EnumFacing side) + public boolean hasCapability(@Nonnull Capability capability, EnumFacing side) { if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { @@ -107,7 +109,7 @@ public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IF } @Override - public T getCapability(Capability capability, EnumFacing side) + public T getCapability(@Nonnull Capability capability, EnumFacing side) { if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 8d7f5a707..846758878 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -22,6 +22,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemMekanismArmor extends ItemArmor { public ItemMekanismArmor(ArmorMaterial enumarmormaterial, int renderIndex, EntityEquipmentSlot slot) @@ -45,9 +47,9 @@ public class ItemMekanismArmor extends ItemArmor } @Override - public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) + public boolean getIsRepairable(ItemStack stack1, @Nonnull ItemStack stack2) { - return StackUtils.equalsWildcard(getRepairStack(), stack2) ? true : super.getIsRepairable(stack1, stack2); + return StackUtils.equalsWildcard(getRepairStack(), stack2) || super.getIsRepairable(stack1, stack2); } private ItemStack getRepairStack() diff --git a/src/main/java/mekanism/tools/item/ItemMekanismAxe.java b/src/main/java/mekanism/tools/item/ItemMekanismAxe.java index 430056a05..34b03bbdf 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismAxe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismAxe.java @@ -13,6 +13,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemMekanismAxe extends ItemAxe { public ItemMekanismAxe(ToolMaterial tool) @@ -29,7 +31,7 @@ public class ItemMekanismAxe extends ItemAxe } @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) + public boolean getIsRepairable(ItemStack toRepair, @Nonnull ItemStack repair) { return StackUtils.equalsWildcard(ItemMekanismTool.getRepairStack(toolMaterial), repair) || super.getIsRepairable(toRepair, repair); } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index 3ccf1a000..4b78cec94 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -29,6 +29,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import com.google.common.collect.Multimap; +import javax.annotation.Nonnull; + public class ItemMekanismHoe extends ItemMekanism { protected ToolMaterial toolMaterial; @@ -48,9 +50,10 @@ public class ItemMekanismHoe extends ItemMekanism @Override public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) { - return StackUtils.equalsWildcard(ItemMekanismTool.getRepairStack(toolMaterial), stack2) ? true : super.getIsRepairable(stack1, stack2); + return StackUtils.equalsWildcard(ItemMekanismTool.getRepairStack(toolMaterial), stack2) || super.getIsRepairable(stack1, stack2); } + @Nonnull @Override @SuppressWarnings("incomplete-switch") public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) @@ -78,7 +81,7 @@ public class ItemMekanismHoe extends ItemMekanism if(block == Blocks.DIRT) { - switch((BlockDirt.DirtType)iblockstate.getValue(BlockDirt.VARIANT)) + switch(iblockstate.getValue(BlockDirt.VARIANT)) { case DIRT: setBlock(stack, playerIn, worldIn, pos, Blocks.FARMLAND.getDefaultState()); @@ -104,9 +107,10 @@ public class ItemMekanismHoe extends ItemMekanism stack.damageItem(1, player); } } - + + @Nonnull @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack) + public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot equipmentSlot, ItemStack stack) { Multimap multimap = super.getAttributeModifiers(equipmentSlot, stack); diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java index a362f983f..b6f4f291a 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java @@ -8,6 +8,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + public class ItemMekanismPaxel extends ItemMekanismTool { public ItemMekanismPaxel(ToolMaterial toolMaterial) @@ -16,13 +18,13 @@ public class ItemMekanismPaxel extends ItemMekanismTool } @Override - public float getDestroySpeed(ItemStack stack, IBlockState blockState) + public float getDestroySpeed(@Nonnull ItemStack stack, IBlockState blockState) { return blockState.getBlock() != Blocks.BEDROCK ? efficiency : 1.0F; } @Override - public boolean canHarvestBlock(IBlockState state, ItemStack stack) + public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack) { Block block = state.getBlock(); diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java b/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java index 0db2ef3d5..d6969d5e1 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java @@ -10,9 +10,11 @@ import net.minecraft.item.ItemStack; import com.google.common.collect.Sets; +import javax.annotation.Nonnull; + public class ItemMekanismPickaxe extends ItemMekanismTool { - private static final Set EFFECTIVE_ON = Sets.newHashSet(new Block[] {Blocks.ACTIVATOR_RAIL, Blocks.COAL_ORE, Blocks.COBBLESTONE, Blocks.DETECTOR_RAIL, Blocks.DIAMOND_BLOCK, Blocks.DIAMOND_ORE, Blocks.DOUBLE_STONE_SLAB, Blocks.GOLDEN_RAIL, Blocks.GOLD_BLOCK, Blocks.GOLD_ORE, Blocks.ICE, Blocks.IRON_BLOCK, Blocks.IRON_ORE, Blocks.LAPIS_BLOCK, Blocks.LAPIS_ORE, Blocks.LIT_REDSTONE_ORE, Blocks.MOSSY_COBBLESTONE, Blocks.NETHERRACK, Blocks.PACKED_ICE, Blocks.RAIL, Blocks.REDSTONE_ORE, Blocks.SANDSTONE, Blocks.RED_SANDSTONE, Blocks.STONE, Blocks.STONE_SLAB, Blocks.STONE_BUTTON, Blocks.STONE_PRESSURE_PLATE}); + private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.ACTIVATOR_RAIL, Blocks.COAL_ORE, Blocks.COBBLESTONE, Blocks.DETECTOR_RAIL, Blocks.DIAMOND_BLOCK, Blocks.DIAMOND_ORE, Blocks.DOUBLE_STONE_SLAB, Blocks.GOLDEN_RAIL, Blocks.GOLD_BLOCK, Blocks.GOLD_ORE, Blocks.ICE, Blocks.IRON_BLOCK, Blocks.IRON_ORE, Blocks.LAPIS_BLOCK, Blocks.LAPIS_ORE, Blocks.LIT_REDSTONE_ORE, Blocks.MOSSY_COBBLESTONE, Blocks.NETHERRACK, Blocks.PACKED_ICE, Blocks.RAIL, Blocks.REDSTONE_ORE, Blocks.SANDSTONE, Blocks.RED_SANDSTONE, Blocks.STONE, Blocks.STONE_SLAB, Blocks.STONE_BUTTON, Blocks.STONE_PRESSURE_PLATE); public ItemMekanismPickaxe(ToolMaterial toolMaterial) { @@ -20,7 +22,7 @@ public class ItemMekanismPickaxe extends ItemMekanismTool } @Override - public boolean canHarvestBlock(IBlockState state, ItemStack stack) + public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack) { Block block = state.getBlock(); @@ -68,9 +70,9 @@ public class ItemMekanismPickaxe extends ItemMekanismTool } @Override - public float getDestroySpeed(ItemStack itemstack, IBlockState blockState) + public float getDestroySpeed(@Nonnull ItemStack itemstack, IBlockState blockState) { - if(blockState != null && blockState.getBlock() != null && (blockState.getMaterial() == Material.IRON || blockState.getMaterial() == Material.ANVIL || blockState.getMaterial() == Material.ROCK)) + if(blockState != null && (blockState.getMaterial() == Material.IRON || blockState.getMaterial() == Material.ANVIL || blockState.getMaterial() == Material.ROCK)) { return efficiency; } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismShovel.java b/src/main/java/mekanism/tools/item/ItemMekanismShovel.java index 978e4bac3..095beac5e 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismShovel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismShovel.java @@ -18,9 +18,11 @@ import net.minecraft.world.World; import com.google.common.collect.Sets; +import javax.annotation.Nonnull; + public class ItemMekanismShovel extends ItemMekanismTool { - private static final Set EFFECTIVE_ON = Sets.newHashSet(new Block[] {Blocks.CLAY, Blocks.DIRT, Blocks.FARMLAND, Blocks.GRASS, Blocks.GRAVEL, Blocks.MYCELIUM, Blocks.SAND, Blocks.SNOW, Blocks.SNOW_LAYER, Blocks.SOUL_SAND, Blocks.GRASS_PATH}); + private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.CLAY, Blocks.DIRT, Blocks.FARMLAND, Blocks.GRASS, Blocks.GRAVEL, Blocks.MYCELIUM, Blocks.SAND, Blocks.SNOW, Blocks.SNOW_LAYER, Blocks.SOUL_SAND, Blocks.GRASS_PATH); public ItemMekanismShovel(ToolMaterial enumtoolmaterial) { @@ -28,12 +30,13 @@ public class ItemMekanismShovel extends ItemMekanismTool } @Override - public boolean canHarvestBlock(IBlockState state, ItemStack stack) + public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack) { Block block = state.getBlock(); return block == Blocks.SNOW_LAYER || block == Blocks.SNOW; } - + + @Nonnull @Override public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index 874ed0486..1619237a4 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -12,6 +12,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemMekanismSword extends ItemSword { private ToolMaterial toolMaterial; @@ -31,8 +33,8 @@ public class ItemMekanismSword extends ItemSword } @Override - public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) + public boolean getIsRepairable(ItemStack stack1, @Nonnull ItemStack stack2) { - return StackUtils.equalsWildcard(ItemMekanismTool.getRepairStack(toolMaterial), stack2) ? true : super.getIsRepairable(stack1, stack2); + return StackUtils.equalsWildcard(ItemMekanismTool.getRepairStack(toolMaterial), stack2) || super.getIsRepairable(stack1, stack2); } } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index 5f1c6618d..d87ad56e9 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -17,6 +17,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemMekanismTool extends ItemTool { public ItemMekanismTool(float attack, float speed, ToolMaterial toolMaterial, Set effectiveBlocksIn) @@ -33,9 +35,9 @@ public class ItemMekanismTool extends ItemTool } @Override - public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) + public boolean getIsRepairable(ItemStack stack1, @Nonnull ItemStack stack2) { - return StackUtils.equalsWildcard(getRepairStack(), stack2) ? true : super.getIsRepairable(stack1, stack2); + return StackUtils.equalsWildcard(getRepairStack(), stack2) || super.getIsRepairable(stack1, stack2); } private ItemStack getRepairStack()