mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Squashed commit of the following:
commit 0d4dc5991e572793134c0c1af8bb35db528071ad Author: pupnewfster <[email protected]> Date: Thu Mar 7 19:25:28 2019 -0500 IntelliJ inspections, Unused Import commit c757d3236b6304b1d3295ad392b88677bccf3003 Author: pupnewfster <[email protected]> Date: Thu Mar 7 19:09:24 2019 -0500 IntelliJ inspections, Constant conditions & exceptions commit c63a821ef9fc705941052a876cc1ef950471912e Author: pupnewfster <[email protected]> Date: Thu Mar 7 17:41:31 2019 -0500 IntelliJ inspections, @NotNull/@Nullable problems commit 506bbfd3241336082b17e5d47f8cec496666dcff Author: pupnewfster <[email protected]> Date: Thu Mar 7 16:50:46 2019 -0500 IntelliJ inspections, Unused label commit bad10c2428346b5feb1816e4a78d7cc2bc1259f0 Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:33:54 2019 -0500 IntelliJ inspections, Unused assignment commit bfe633afbfb6380d0f5ee2e8ab14f8981a455681 Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:32:02 2019 -0500 IntelliJ inspections, 'equals()' between objects of inconvertible types commit 6d179f8639fad1a7c3fa01467c003a8fd309da09 Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:29:28 2019 -0500 IntelliJ inspections, Unused import commit c21f1cfa5566308237dc8bddb8b79908e272a637 Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:25:41 2019 -0500 IntelliJ inspections, Unused import commit e5d9e03af582c7315b057861b8f0019e46157dee Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:23:10 2019 -0500 IntelliJ inspections, Redundant 'throws' clause commit 1c589ba5740411a5595e9fda177696670bc7b7df Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:21:07 2019 -0500 IntelliJ inspections, Static member referenced by instance variable commit 6c17e9ca7fb22a0e285337133659e826f3bfdfee Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:20:02 2019 -0500 IntelliJ inspections, Catch block may ignore exception commit 42b3cd788ceb7d6ce657d582bbbd8345a2ec5676 Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:16:29 2019 -0500 IntelliJ inspections, Unnecessary label on 'break' statement commit f6abc3c66f3aca147edb274720cdb94bff568b0b Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:15:29 2019 -0500 IntelliJ inspections, Too weak variable type leads to unnecessary cast commit 6356d1fea8d55907ae1c7b011223fbbc07236c1f Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:11:17 2019 -0500 IntelliJ inspections, Redundant type cast commit 559c1a2ff523fd7e23f3750d5c801af73876f1d0 Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:04:45 2019 -0500 IntelliJ inspections, Redundant type arguments commit ae816ec2a79cf4c8fee776db651a54f68c1dacaa Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:01:27 2019 -0500 IntelliJ inspections, Redundant Collection operation commit 1da69b8baff922b98a32163c7d5f90aa77a6a8bc Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:00:55 2019 -0500 IntelliJ inspections, Redundant array creation commit 7e3ef81a3597c596d2206c93442e950ac9183de0 Author: pupnewfster <[email protected]> Date: Thu Mar 7 15:00:11 2019 -0500 IntelliJ inspections, Condition is covered by further condition commit f298bbb9f31ecbe935ef6cbf98b56951434a05f8 Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:58:10 2019 -0500 IntelliJ inspections, Redundant 'Collection.addAll()' call commit ce715c5cd724c4dc71ff2cb53e5bc12f16289f12 Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:56:56 2019 -0500 IntelliJ inspections, 'Collection.toArray()' call style commit 0bde4b0eb23ac5d8f40a410ed55315e4a422a30c Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:55:40 2019 -0500 IntelliJ inspections, Calls to 'Arrays.asList()' with too few arguments commit 6d06d11dcf9c077ed6b216a0bbd61434b10fc610 Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:52:26 2019 -0500 IntelliJ inspections, Pointless arithmetic expression commit 6501d725af1eda5127489f77fd723396002b29b2 Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:42:32 2019 -0500 IntelliJ inspections, Anonymous type can be replaced with lambda commit 85341ae5df9d63fb0ad7281c260c77d064adf0c2 Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:41:40 2019 -0500 IntelliJ inspections, Explicit type can be replaced with <> commit 7e2feae7189b92cb513499aed113d4a2634622c6 Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:38:47 2019 -0500 IntelliJ inspections, Unnecessary 'null' check before method call commit 2c75a38fe9a969f832cd5777f4fad81ef47d037b Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:37:33 2019 -0500 IntelliJ inspections, 'switch' statement with too few branches commit 2e2aff57f7910aef5a68f41a1918e2c8a98509ec Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:34:50 2019 -0500 IntelliJ inspections, Simplifiable conditional statement commit 243f6a975f8b3da5e70a5c1a116db2aedd10900e Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:33:09 2019 -0500 IntelliJ inspections, Duplicate condition in 'if' statement commit a80c67fc30b737990e7805a8741dce120232badc Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:32:17 2019 -0500 IntelliJ inspections, Unnecessary semicolon commit 5a7220ee574c9d38d71db07e4fa995a56fee1eed Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:31:58 2019 -0500 IntelliJ inspections, Unnecessary enum/interface modifier commit f3a66f4462033d2f446c2961a1ad8e9cfde3ed36 Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:30:36 2019 -0500 IntelliJ inspections, Unnecessary conversion to String commit 1662540be864db4669cd80c8c46a9b35be202b62 Author: pupnewfster <[email protected]> Date: Thu Mar 7 14:29:33 2019 -0500 IntelliJ inspections, C styled array declaration
This commit is contained in:
1 parent
a148f71358
commit
95ca29fa19
373 files changed
+2213
-1740
No files matched your search
@@ -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> T getCapability(Capability<T> capability, EnumFacing side)
|
||||
public <T> T getCapability(@Nonnull Capability<T> 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)
|
||||
|
||||
Reference in new issue
Block a user