diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java b/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java index 740a9def9..2434e2fbb 100644 --- a/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java +++ b/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java @@ -117,7 +117,7 @@ public final class ComputerCraftAPI * @see dan200.computercraft.api.peripheral.IComputerAccess#mountWritable(String, IWritableMount) * @see dan200.computercraft.api.filesystem.IMount */ - public static IMount createResourceMount( Class modClass, String domain, String subPath ) + public static IMount createResourceMount( Class modClass, String domain, String subPath ) { findCC(); if( computerCraft_createResourceMount != null ) @@ -288,7 +288,7 @@ public final class ComputerCraftAPI } } - private static Method findCCMethod( String name, Class[] args ) + private static Method findCCMethod( String name, Class[] args ) { try { if( computerCraft != null ) @@ -303,7 +303,7 @@ public final class ComputerCraftAPI } private static boolean ccSearched = false; - private static Class computerCraft = null; + private static Class computerCraft = null; private static Method computerCraft_getVersion = null; private static Method computerCraft_createUniqueNumberedSaveDir = null; private static Method computerCraft_createSaveDirMount = null; diff --git a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java index 4caccdc8b..6eb6e7f04 100644 --- a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java @@ -14,6 +14,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -27,7 +28,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper +public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper { private static final GuiDummy gui = new GuiDummy(); @@ -145,7 +146,7 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper } @Override - public List getTooltipStrings(int mouseX, int mouseY) + public List getTooltipStrings(int mouseX, int mouseY) { return Collections.emptyList(); } diff --git a/src/main/java/mekanism/client/jei/GuiElementHandler.java b/src/main/java/mekanism/client/jei/GuiElementHandler.java index dfba58809..6415bfa82 100644 --- a/src/main/java/mekanism/client/jei/GuiElementHandler.java +++ b/src/main/java/mekanism/client/jei/GuiElementHandler.java @@ -18,7 +18,7 @@ public class GuiElementHandler implements IAdvancedGuiHandler } @Override - public List getGuiExtraAreas(GuiContainer gui) + public List getGuiExtraAreas(GuiContainer gui) { if(gui instanceof GuiMekanism) { diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 4073a5b41..b50644e0c 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -318,7 +318,7 @@ public class MekanismJEI implements IModPlugin registry.addRecipeCatalyst(type.getStack(), "mekanism." + type.getName()); } - private void addRecipes(IModRegistry registry, Recipe type, Class recipe, Class wrapper, String recipeCategoryUid) + private void addRecipes(IModRegistry registry, Recipe type, Class recipe, Class wrapper, String recipeCategoryUid) { List recipes = new ArrayList<>(); diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 633e0e10b..942600513 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -207,7 +207,7 @@ public class PacketHandler } else if(data instanceof ArrayList) { - encode(((ArrayList)data).toArray(), output); + encode(((ArrayList)data).toArray(), output); } else { throw new RuntimeException("Un-encodable data passed to encode(): " + data + ", full data: " + Arrays.toString(dataValues)); diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 8a05ccc3f..890bbf54b 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -700,7 +700,7 @@ public final class Tier return; } - for(Class c : Tier.class.getDeclaredClasses()) + for(Class c : Tier.class.getDeclaredClasses()) { if(c.isEnum()) { diff --git a/src/main/java/mekanism/common/base/FluidItemWrapper.java b/src/main/java/mekanism/common/base/FluidItemWrapper.java index fee6ecedb..49884b876 100644 --- a/src/main/java/mekanism/common/base/FluidItemWrapper.java +++ b/src/main/java/mekanism/common/base/FluidItemWrapper.java @@ -71,7 +71,7 @@ public class FluidItemWrapper extends ItemCapability implements IFluidHandlerIte } @Override - public boolean canProcess(Capability cap) + public boolean canProcess(Capability cap) { return cap == CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY; } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 307e7d892..778f0e764 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -208,7 +208,7 @@ public abstract class BlockBasic extends Block if(tileEntity instanceof IMultiblock) { - ((IMultiblock)tileEntity).doUpdate(); + ((IMultiblock)tileEntity).doUpdate(); } if(tileEntity instanceof TileEntityBasicBlock) @@ -315,7 +315,7 @@ public abstract class BlockBasic extends Block case 2: case 7: case 8: - TileEntityMultiblock tileEntity = (TileEntityMultiblock) MekanismUtils.getTileEntitySafe(world, pos); + TileEntityMultiblock tileEntity = (TileEntityMultiblock) MekanismUtils.getTileEntitySafe(world, pos); if(tileEntity != null) { @@ -506,7 +506,7 @@ public abstract class BlockBasic extends Block return true; } - return ((IMultiblock)world.getTileEntity(pos)).onActivate(entityplayer, hand, stack); + return ((IMultiblock)world.getTileEntity(pos)).onActivate(entityplayer, hand, stack); } else if(tile instanceof IStructuralMultiblock) { @@ -791,7 +791,7 @@ public abstract class BlockBasic extends Block if(tileEntity instanceof IMultiblock) { - ((IMultiblock)tileEntity).doUpdate(); + ((IMultiblock)tileEntity).doUpdate(); } if(tileEntity instanceof IStructuralMultiblock) diff --git a/src/main/java/mekanism/common/block/property/PropertyColor.java b/src/main/java/mekanism/common/block/property/PropertyColor.java index ed20c2d4e..0434ccc30 100644 --- a/src/main/java/mekanism/common/block/property/PropertyColor.java +++ b/src/main/java/mekanism/common/block/property/PropertyColor.java @@ -3,7 +3,7 @@ package mekanism.common.block.property; import mekanism.api.EnumColor; import net.minecraftforge.common.property.IUnlistedProperty; -public class PropertyColor implements IUnlistedProperty +public final class PropertyColor implements IUnlistedProperty { public static PropertyColor INSTANCE = new PropertyColor(); @@ -29,9 +29,9 @@ public class PropertyColor implements IUnlistedProperty } @Override - public Class getType() + public Class getType() { - return getClass(); + return PropertyColor.class; } @Override diff --git a/src/main/java/mekanism/common/block/property/PropertyConnection.java b/src/main/java/mekanism/common/block/property/PropertyConnection.java index 1d6db0d8a..78547b1a0 100644 --- a/src/main/java/mekanism/common/block/property/PropertyConnection.java +++ b/src/main/java/mekanism/common/block/property/PropertyConnection.java @@ -5,7 +5,7 @@ import java.util.Arrays; import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType; import net.minecraftforge.common.property.IUnlistedProperty; -public class PropertyConnection implements IUnlistedProperty +public final class PropertyConnection implements IUnlistedProperty { public static PropertyConnection INSTANCE = new PropertyConnection(); @@ -37,9 +37,9 @@ public class PropertyConnection implements IUnlistedProperty } @Override - public Class getType() + public Class getType() { - return getClass(); + return PropertyConnection.class; } @Override diff --git a/src/main/java/mekanism/common/block/states/BlockStateFacing.java b/src/main/java/mekanism/common/block/states/BlockStateFacing.java index b1a7c9a62..2619ea593 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateFacing.java +++ b/src/main/java/mekanism/common/block/states/BlockStateFacing.java @@ -12,17 +12,17 @@ public class BlockStateFacing extends BlockStateContainer { public static final PropertyDirection facingProperty = PropertyDirection.create("facing"); - public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty, PropertyEnum tierProperty, PropertyEnum recipeProperty) + public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty, PropertyEnum tierProperty, PropertyEnum recipeProperty) { super(block, facingProperty, typeProperty, activeProperty, tierProperty, recipeProperty); } - public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty) + public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty) { super(block, facingProperty, typeProperty, activeProperty); } - public BlockStateFacing(Block block, PropertyEnum typeProperty) + public BlockStateFacing(Block block, PropertyEnum typeProperty) { super(block, facingProperty, typeProperty); } diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index bb2e72ae0..037cac58b 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -77,7 +77,7 @@ public class BlockStateMachine extends ExtendedBlockState public static final PropertyEnum tierProperty = PropertyEnum.create("tier", BaseTier.class); public static final PropertyEnum recipeProperty = PropertyEnum.create("recipe", RecipeType.class); - public BlockStateMachine(BlockMachine block, PropertyEnum typeProperty) + public BlockStateMachine(BlockMachine block, PropertyEnum typeProperty) { super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty, tierProperty, recipeProperty}, new IUnlistedProperty[] {}); } diff --git a/src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java b/src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java index 3dd961263..6a77c93d5 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java +++ b/src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java @@ -18,7 +18,7 @@ public class DefaultStorageHelper public NBTBase writeNBT(Capability capability, T instance, EnumFacing side) { if(instance instanceof INBTSerializable) - return ((INBTSerializable)instance).serializeNBT(); + return ((INBTSerializable)instance).serializeNBT(); return new NBTTagCompound(); } @@ -27,7 +27,7 @@ public class DefaultStorageHelper { if(instance instanceof INBTSerializable) { - Class nbtClass = ((INBTSerializable)instance).serializeNBT().getClass(); + Class nbtClass = ((INBTSerializable)instance).serializeNBT().getClass(); if(nbtClass.isInstance(nbt)) { diff --git a/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java b/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java index 5146b4a0c..52dff71f1 100644 --- a/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java +++ b/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java @@ -57,7 +57,7 @@ public class ItemCapabilityWrapper implements ICapabilityProvider { private ItemCapabilityWrapper wrapper; - public abstract boolean canProcess(Capability capability); + public abstract boolean canProcess(Capability capability); public ItemStack getStack() { diff --git a/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java b/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java index 4686211cc..801dce375 100644 --- a/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java +++ b/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java @@ -63,14 +63,14 @@ public class RobitAIPickup extends EntityAIBase return true; } - List items = theRobit.world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(theRobit.posX-10, theRobit.posY-10, theRobit.posZ-10, theRobit.posX+10, theRobit.posY+10, theRobit.posZ+10)); - Iterator iter = items.iterator(); + List items = theRobit.world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(theRobit.posX-10, theRobit.posY-10, theRobit.posZ-10, theRobit.posX+10, theRobit.posY+10, theRobit.posZ+10)); + Iterator iter = items.iterator(); //Cached for slight performance double closestDistance = -1; while(iter.hasNext()) { - EntityItem entity = (EntityItem)iter.next(); + EntityItem entity = iter.next(); double distance = theRobit.getDistanceToEntity(entity); diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index af5204464..aad82ec82 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -39,7 +39,7 @@ public class FrequencyManager private Class frequencyClass; - public FrequencyManager(Class c, String n) + public FrequencyManager(Class c, String n) { frequencyClass = c; name = n; @@ -47,7 +47,7 @@ public class FrequencyManager managers.add(this); } - public FrequencyManager(Class c, String n, UUID uuid) + public FrequencyManager(Class c, String n, UUID uuid) { this(c, n); @@ -347,7 +347,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(new Class[] {NBTTagCompound.class}); Frequency freq = (Frequency)c.newInstance(compound); loadedFrequencies.add(freq); diff --git a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyItemWrapper.java b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyItemWrapper.java index 046e6630f..4530aae3a 100644 --- a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyItemWrapper.java +++ b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyItemWrapper.java @@ -10,7 +10,7 @@ import net.minecraftforge.energy.IEnergyStorage; public class ForgeEnergyItemWrapper extends ItemCapability implements IEnergyStorage { @Override - public boolean canProcess(Capability capability) + public boolean canProcess(Capability capability) { return capability == CapabilityEnergy.ENERGY; } diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java b/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java index 42898b7e4..4d7607d02 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.common.Optional.Method; public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, ITeslaConsumer, ITeslaProducer { @Override - public boolean canProcess(Capability capability) + public boolean canProcess(Capability capability) { return capability == Capabilities.TESLA_HOLDER_CAPABILITY || capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getItem().canReceive(getStack()) || diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index 6bb9bb129..21550be42 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -15,7 +15,7 @@ import net.minecraft.world.World; public class MultiblockManager> { - private static Set managers = new HashSet<>(); + private static Set> managers = new HashSet<>(); public String name; @@ -65,7 +65,7 @@ public class MultiblockManager> public static void tick(World world) { - for(MultiblockManager manager : managers) + for(MultiblockManager manager : managers) { manager.tickSelf(world); } @@ -148,7 +148,7 @@ public class MultiblockManager> public static void reset() { - for(MultiblockManager manager : managers) + for(MultiblockManager manager : managers) { manager.inventories.clear(); } diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 09530899a..7a80a40c6 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -467,7 +467,7 @@ public abstract class UpdateProtocol> if(tile instanceof TileEntityMultiblock) { - ((TileEntityMultiblock)tile).structure = null; + ((TileEntityMultiblock)tile).structure = null; } else if(tile instanceof IStructuralMultiblock) { diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 4bd642b10..f53545057 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -39,7 +39,7 @@ public class PacketDataRequest implements IMessageHandler)tileEntity).sendStructure = true; } if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 1c93f548a..0d7976269 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -512,8 +512,8 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement || super.hasCapability(capability, facing); } - private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager(IEnergyWrapper.class, TeslaIntegration.class); - private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager(IEnergyWrapper.class, ForgeEnergyIntegration.class); + private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, TeslaIntegration.class); + private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, ForgeEnergyIntegration.class); @Override public T getCapability(Capability capability, EnumFacing facing) diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 2c1b703fc..f2c0c5b38 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -45,7 +45,7 @@ public abstract class TileEntityMultiblock> extend public boolean isRendering; /** This multiblock segment's cached data */ - public MultiblockCache cachedData = getNewCache(); + public MultiblockCache cachedData = getNewCache(); /** This multiblock segment's cached inventory ID */ public String cachedID = null; diff --git a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java index c10353301..125a8a82d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java +++ b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java @@ -25,7 +25,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural if(masterTile instanceof IMultiblock) { - return ((IMultiblock)masterTile).onActivate(player, hand, stack); + return ((IMultiblock)masterTile).onActivate(player, hand, stack); } else { master = null; @@ -44,14 +44,14 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural if(masterTile instanceof IMultiblock) { - ((IMultiblock)masterTile).doUpdate(); + ((IMultiblock)masterTile).doUpdate(); } else { master = null; } } else { - IMultiblock multiblock = new ControllerFinder().find(); + IMultiblock multiblock = new ControllerFinder().find(); if(multiblock != null) { @@ -74,7 +74,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural public class ControllerFinder { - public IMultiblock found; + public IMultiblock found; public Set iterated = new HashSet<>(); @@ -96,7 +96,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural { if(tile instanceof IMultiblock) { - found = (IMultiblock)tile; + found = (IMultiblock)tile; return; } else if(tile instanceof IStructuralMultiblock) @@ -107,7 +107,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural } } - public IMultiblock find() + public IMultiblock find() { loop(Coord4D.get(TileEntityStructuralGlass.this)); diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java index 41a3164d3..18396c9fe 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java @@ -289,7 +289,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } - private CapabilityWrapperManager itemManager = new CapabilityWrapperManager(ISidedInventory.class, ItemHandlerWrapper.class); + private CapabilityWrapperManager itemManager = new CapabilityWrapperManager<>(ISidedInventory.class, ItemHandlerWrapper.class); @Override public T getCapability(Capability capability, EnumFacing facing) diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index 6620fd736..e399f40a5 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -429,8 +429,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i || super.hasCapability(capability, facing); } - private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager(IEnergyWrapper.class, TeslaIntegration.class); - private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager(IEnergyWrapper.class, ForgeEnergyIntegration.class); + private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, TeslaIntegration.class); + private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, ForgeEnergyIntegration.class); @Override public T getCapability(Capability capability, EnumFacing facing) diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index a6813e86f..43c8ac291 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -335,7 +335,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter manager = new CapabilityWrapperManager<>(IFluidHandlerWrapper.class, FluidHandlerWrapper.class); @Override public T getCapability(Capability capability, EnumFacing side) diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 9cc37c6d7..e8f571567 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -43,7 +43,7 @@ public final class MinerUtils if(silk && block.canSilkHarvest(world, obj.getPos(), state, null)) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); if (getSilkTouchDrop != null) { try diff --git a/src/main/java/mekanism/common/util/ReflectionUtils.java b/src/main/java/mekanism/common/util/ReflectionUtils.java index 36e57c44b..117dfdeaa 100644 --- a/src/main/java/mekanism/common/util/ReflectionUtils.java +++ b/src/main/java/mekanism/common/util/ReflectionUtils.java @@ -12,7 +12,7 @@ public final class ReflectionUtils * @param fields - possible names of field to iterate through * @return value as an Object, cast as necessary */ - public static Object getPrivateValue(Object obj, Class c, String[] fields) + public static Object getPrivateValue(T obj, Class c, String[] fields) { for(String field : fields) { @@ -35,7 +35,7 @@ public final class ReflectionUtils * @param c - Class the operation will be performed on * @param fields - possible names of field to iterate through */ - public static void setPrivateValue(Object obj, Object value, Class c, String[] fields) + public static void setPrivateValue(T obj, Object value, Class c, String[] fields) { for(String field : fields) { @@ -56,7 +56,7 @@ public final class ReflectionUtils * @param params - the Types inserted as parameters into the method * @return private method */ - public static Method getPrivateMethod(Class c, String[] methods, Class... params) + public static Method getPrivateMethod(Class c, String[] methods, Class... params) { for(String method : methods) { diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 63f79a3fd..b93486373 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -48,7 +48,7 @@ public class VoiceConnection extends Thread while(username == null && retryCount <= 100) { try { - List l = Collections.synchronizedList(new ArrayList<>(server.getPlayerList().getPlayers())); + List l = Collections.synchronizedList(new ArrayList<>(server.getPlayerList().getPlayers())); for(Object obj : l) { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 3f548c586..ea1c4157e 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -35,7 +35,7 @@ public class GuiReactorController extends GuiMekanism { guiElements.add(new GuiEnergyInfo(() -> tileEntity.isFormed() ? ListUtils.asList( LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList<>(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 79, 38)); guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index fc23687e8..ef8560c23 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -45,7 +45,7 @@ public class GuiReactorFuel extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiEnergyInfo(() -> tileEntity.isFormed() ? ListUtils.asList( LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList<>(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiGasGauge(() -> tentity.deuteriumTank, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 25, 64)); guiElements.add(new GuiGasGauge(() -> tentity.fuelTank, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 79, 50)); guiElements.add(new GuiGasGauge(() -> tentity.tritiumTank, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 133, 64)); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 917f234a6..7c1e15024 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -48,7 +48,7 @@ public class GuiReactorHeat extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiEnergyInfo(() -> tileEntity.isFormed() ? ListUtils.asList( LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList<>(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiNumberGauge(new INumberInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index 36b9b0b9c..ecbd8fcec 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -39,7 +39,7 @@ public class GuiReactorStats extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiEnergyInfo(() -> tileEntity.isFormed() ? ListUtils.asList( LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList<>(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 3a321d39a..4e9b8f6e0 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -154,7 +154,7 @@ public abstract class BlockGenerator extends BlockContainer if(tileEntity instanceof IMultiblock) { - ((IMultiblock)tileEntity).doUpdate(); + ((IMultiblock)tileEntity).doUpdate(); } if(tileEntity instanceof TileEntityBasicBlock) @@ -206,7 +206,7 @@ public abstract class BlockGenerator extends BlockContainer if(!world.isRemote && tileEntity instanceof IMultiblock) { - ((IMultiblock)tileEntity).doUpdate(); + ((IMultiblock)tileEntity).doUpdate(); } } @@ -411,7 +411,7 @@ public abstract class BlockGenerator extends BlockContainer if(metadata == GeneratorType.TURBINE_CASING.meta || metadata == GeneratorType.TURBINE_VALVE.meta || metadata == GeneratorType.TURBINE_VENT.meta) { - return ((IMultiblock)tileEntity).onActivate(entityplayer, hand, stack); + return ((IMultiblock)tileEntity).onActivate(entityplayer, hand, stack); } if(metadata == GeneratorType.TURBINE_ROTOR.meta) 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 eee5f5b64..f0b6bcb06 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -47,7 +47,7 @@ public class BlockStateGenerator extends ExtendedBlockState { public static final PropertyBool activeProperty = PropertyBool.create("active"); - public BlockStateGenerator(BlockGenerator block, PropertyEnum typeProperty) + public BlockStateGenerator(BlockGenerator block, PropertyEnum typeProperty) { super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty}, new IUnlistedProperty[] {}); } 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 f793c37b3..da34a5361 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -476,8 +476,8 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I return super.hasCapability(capability, side); } - private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager(IEnergyWrapper.class, TeslaIntegration.class); - private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager(IEnergyWrapper.class, ForgeEnergyIntegration.class); + private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, TeslaIntegration.class); + private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager<>(IEnergyWrapper.class, ForgeEnergyIntegration.class); @Override public T getCapability(Capability capability, EnumFacing side)