diff --git a/src/main/java/mekanism/api/EnumColor.java b/src/main/java/mekanism/api/EnumColor.java index 102189027..eb5ba2b0a 100644 --- a/src/main/java/mekanism/api/EnumColor.java +++ b/src/main/java/mekanism/api/EnumColor.java @@ -44,7 +44,7 @@ public enum EnumColor implements IStringSerializable public String dyeName; - private EnumColor(String s, String n, String dye, int[] rgb, int meta) + EnumColor(String s, String n, String dye, int[] rgb, int meta) { code = s; unlocalizedName = n; diff --git a/src/main/java/mekanism/api/IAlloyInteraction.java b/src/main/java/mekanism/api/IAlloyInteraction.java index 9990ccfa0..0aa001629 100644 --- a/src/main/java/mekanism/api/IAlloyInteraction.java +++ b/src/main/java/mekanism/api/IAlloyInteraction.java @@ -18,5 +18,5 @@ public interface IAlloyInteraction * @param stack - the stack of alloy being right-clicked * @param tierOrdinal - the ordinal tier of the alloy (1 = advanced, 2 = elite, 3 = ultimate) */ - public void onAlloyInteraction(EntityPlayer player, EnumHand hand, ItemStack stack, int tierOrdinal); + void onAlloyInteraction(EntityPlayer player, EnumHand hand, ItemStack stack, int tierOrdinal); } diff --git a/src/main/java/mekanism/api/IClientTicker.java b/src/main/java/mekanism/api/IClientTicker.java index 228897370..1003b267c 100644 --- a/src/main/java/mekanism/api/IClientTicker.java +++ b/src/main/java/mekanism/api/IClientTicker.java @@ -2,7 +2,7 @@ package mekanism.api; public interface IClientTicker { - public void clientTick(); + void clientTick(); - public boolean needsTicks(); + boolean needsTicks(); } diff --git a/src/main/java/mekanism/api/IConfigCardAccess.java b/src/main/java/mekanism/api/IConfigCardAccess.java index 881d8a035..3d4975889 100644 --- a/src/main/java/mekanism/api/IConfigCardAccess.java +++ b/src/main/java/mekanism/api/IConfigCardAccess.java @@ -10,25 +10,25 @@ import net.minecraft.nbt.NBTTagCompound; */ public interface IConfigCardAccess { - public static interface ISpecialConfigData extends IConfigCardAccess + interface ISpecialConfigData extends IConfigCardAccess { /** * Collects the TileEntity's filter card data into the parameterized NBTTagCompound. * @param nbtTags - the NBTTagCompound of the filter card ItemStack * @return the NBTTagCompound that now contains the TileEntity's filter card data */ - public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags); + NBTTagCompound getConfigurationData(NBTTagCompound nbtTags); /** * Retrieves the TileEntity's data contained in the filter card based on the given NBTTagCompopund. * @param nbtTags - the NBTTagCompound of the filter card ItemStack */ - public void setConfigurationData(NBTTagCompound nbtTags); + void setConfigurationData(NBTTagCompound nbtTags); /** * A String name of this TileEntity that will be displayed as the type of data on the filter card. * @return the String name of this TileEntity */ - public String getDataType(); + String getDataType(); } } diff --git a/src/main/java/mekanism/api/IConfigurable.java b/src/main/java/mekanism/api/IConfigurable.java index 572a79dd3..bc13f757d 100644 --- a/src/main/java/mekanism/api/IConfigurable.java +++ b/src/main/java/mekanism/api/IConfigurable.java @@ -17,7 +17,7 @@ public interface IConfigurable * @param side - the side the block was clicked on * @return action that was performed */ - public EnumActionResult onSneakRightClick(EntityPlayer player, EnumFacing side); + EnumActionResult onSneakRightClick(EntityPlayer player, EnumFacing side); /** * Called when a player right clicks this block with a Configurator. @@ -25,5 +25,5 @@ public interface IConfigurable * @param side - the side the block was clicked on * @return action that was performed */ - public EnumActionResult onRightClick(EntityPlayer player, EnumFacing side); + EnumActionResult onRightClick(EntityPlayer player, EnumFacing side); } diff --git a/src/main/java/mekanism/api/IEvaporationSolar.java b/src/main/java/mekanism/api/IEvaporationSolar.java index fd5d2cf7d..1d42b7ff4 100644 --- a/src/main/java/mekanism/api/IEvaporationSolar.java +++ b/src/main/java/mekanism/api/IEvaporationSolar.java @@ -7,5 +7,5 @@ package mekanism.api; */ public interface IEvaporationSolar { - public boolean seesSun(); + boolean seesSun(); } diff --git a/src/main/java/mekanism/api/IHeatTransfer.java b/src/main/java/mekanism/api/IHeatTransfer.java index 292392f20..54913934d 100644 --- a/src/main/java/mekanism/api/IHeatTransfer.java +++ b/src/main/java/mekanism/api/IHeatTransfer.java @@ -5,24 +5,24 @@ import net.minecraft.util.EnumFacing; public interface IHeatTransfer { /**The value of the zero point of our temperature scale in kelvin*/ - public static final double AMBIENT_TEMP = 300; + double AMBIENT_TEMP = 300; /**The heat transfer coefficient for air*/ - public static final double AIR_INVERSE_COEFFICIENT = 10000; + double AIR_INVERSE_COEFFICIENT = 10000; - public double getTemp(); + double getTemp(); - public double getInverseConductionCoefficient(); + double getInverseConductionCoefficient(); - public double getInsulationCoefficient(EnumFacing side); + double getInsulationCoefficient(EnumFacing side); - public void transferHeatTo(double heat); + void transferHeatTo(double heat); - public double[] simulateHeat(); + double[] simulateHeat(); - public double applyTemperatureChange(); + double applyTemperatureChange(); - public boolean canConnectHeat(EnumFacing side); + boolean canConnectHeat(EnumFacing side); - public IHeatTransfer getAdjacent(EnumFacing side); + IHeatTransfer getAdjacent(EnumFacing side); } diff --git a/src/main/java/mekanism/api/IMekWrench.java b/src/main/java/mekanism/api/IMekWrench.java index 8d426493e..fb7bd8419 100644 --- a/src/main/java/mekanism/api/IMekWrench.java +++ b/src/main/java/mekanism/api/IMekWrench.java @@ -6,5 +6,5 @@ import net.minecraft.util.math.BlockPos; public interface IMekWrench { - public boolean canUseWrench(ItemStack stack, EntityPlayer player, BlockPos pos); + boolean canUseWrench(ItemStack stack, EntityPlayer player, BlockPos pos); } diff --git a/src/main/java/mekanism/api/energy/IEnergizedItem.java b/src/main/java/mekanism/api/energy/IEnergizedItem.java index bcfb5ca29..39ff65886 100644 --- a/src/main/java/mekanism/api/energy/IEnergizedItem.java +++ b/src/main/java/mekanism/api/energy/IEnergizedItem.java @@ -14,40 +14,40 @@ public interface IEnergizedItem * @param itemStack - the ItemStack to check * @return energy stored */ - public double getEnergy(ItemStack itemStack); + double getEnergy(ItemStack itemStack); /** * Sets this item's stored energy value to a new amount. * @param itemStack - the ItemStack who's energy value is to be change * @param amount - new amount of energy */ - public void setEnergy(ItemStack itemStack, double amount); + void setEnergy(ItemStack itemStack, double amount); /** * Gets and returns this item's maximum amount of energy that can be stored. * @param itemStack - the ItemStack to check * @return maximum energy */ - public double getMaxEnergy(ItemStack itemStack); + double getMaxEnergy(ItemStack itemStack); /** * Gets and returns how much energy this item can transfer to and from charging slots. * @param itemStack - the ItemStack to check * @return transfer amount */ - public double getMaxTransfer(ItemStack itemStack); + double getMaxTransfer(ItemStack itemStack); /** * Gets and returns whether or not this item can receive energy from a charging slot. * @param itemStack - the ItemStack to check * @return if the item can receive energy */ - public boolean canReceive(ItemStack itemStack); + boolean canReceive(ItemStack itemStack); /** * Gets and returns whether or not this item can send energy to a charging slot. * @param itemStack - the ItemStack to check * @return if the item can send energy */ - public boolean canSend(ItemStack itemStack); + boolean canSend(ItemStack itemStack); } diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java b/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java index 644aa76e1..9f3164926 100644 --- a/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java +++ b/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java @@ -15,12 +15,12 @@ public interface IStrictEnergyAcceptor * @param simulate - if the operation should be simulated * @return energy used */ - public double acceptEnergy(EnumFacing side, double amount, boolean simulate); + double acceptEnergy(EnumFacing side, double amount, boolean simulate); /** * Whether or not this tile entity can accept energy from a certain side. * @param side - side to check * @return if tile entity accepts energy */ - public boolean canReceiveEnergy(EnumFacing side); + boolean canReceiveEnergy(EnumFacing side); } diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyOutputter.java b/src/main/java/mekanism/api/energy/IStrictEnergyOutputter.java index ef13c095b..99673191c 100644 --- a/src/main/java/mekanism/api/energy/IStrictEnergyOutputter.java +++ b/src/main/java/mekanism/api/energy/IStrictEnergyOutputter.java @@ -15,12 +15,12 @@ public interface IStrictEnergyOutputter * @param simulate - if the operation should be simulated * @return energy sent */ - public double pullEnergy(EnumFacing side, double amount, boolean simulate); + double pullEnergy(EnumFacing side, double amount, boolean simulate); /** * Whether or not this tile entity can output energy on a specific side. * @param side - side to check * @return if the tile entity outputs energy */ - public boolean canOutputEnergy(EnumFacing side); + boolean canOutputEnergy(EnumFacing side); } diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java b/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java index fd560fa18..52e00e23e 100644 --- a/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java +++ b/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java @@ -11,17 +11,17 @@ public interface IStrictEnergyStorage * Gets the amount of energy this TileEntity is currently storing. * @return stored energy */ - public double getEnergy(); + double getEnergy(); /** * Sets the amount of stored energy of this TileEntity to a new amount. * @param energy - new energy value */ - public void setEnergy(double energy); + void setEnergy(double energy); /** * Gets the maximum amount of energy this TileEntity can store. * @return maximum energy */ - public double getMaxEnergy(); + double getMaxEnergy(); } diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java index 8f9842956..62d286628 100644 --- a/src/main/java/mekanism/api/gas/IGasHandler.java +++ b/src/main/java/mekanism/api/gas/IGasHandler.java @@ -14,14 +14,14 @@ public interface IGasHandler * @param stack - gas to add * @return gas added */ - public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer); + int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer); /** * Draws a certain amount of gas from this block. * @param amount - amount to draw * @return gas drawn */ - public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer); + GasStack drawGas(EnumFacing side, int amount, boolean doTransfer); /** * Whether or not this block can accept gas from a certain side. @@ -29,7 +29,7 @@ public interface IGasHandler * @param type - type of gas to check * @return if block accepts gas */ - public boolean canReceiveGas(EnumFacing side, Gas type); + boolean canReceiveGas(EnumFacing side, Gas type); /** * Whether or not this block can be drawn of gas from a certain side. @@ -37,5 +37,5 @@ public interface IGasHandler * @param type - type of gas to check * @return if block can be drawn of gas */ - public boolean canDrawGas(EnumFacing side, Gas type); + boolean canDrawGas(EnumFacing side, Gas type); } diff --git a/src/main/java/mekanism/api/gas/IGasItem.java b/src/main/java/mekanism/api/gas/IGasItem.java index 04231cd81..37f6143d8 100644 --- a/src/main/java/mekanism/api/gas/IGasItem.java +++ b/src/main/java/mekanism/api/gas/IGasItem.java @@ -13,7 +13,7 @@ public interface IGasItem * Gets the rate of transfer this item can handle. * @return */ - public int getRate(ItemStack itemstack); + int getRate(ItemStack itemstack); /** * Adds a defined amount of a certain gas to an item. @@ -22,7 +22,7 @@ public interface IGasItem * @param amount - the amount of gas to add * @return the gas that was accepted by the item */ - public int addGas(ItemStack itemstack, GasStack stack); + int addGas(ItemStack itemstack, GasStack stack); /** * Removes the defined amount of a certain gas from the item. @@ -31,7 +31,7 @@ public interface IGasItem * @param amount - the amount of gas to remove * @return the gas that was removed by the item */ - public GasStack removeGas(ItemStack itemstack, int amount); + GasStack removeGas(ItemStack itemstack, int amount); /** * Whether or not this storage tank be given a specific gas. @@ -39,7 +39,7 @@ public interface IGasItem * @param type - the type of gas the tank can possibly receive * @return if the item be charged */ - public boolean canReceiveGas(ItemStack itemstack, Gas type); + boolean canReceiveGas(ItemStack itemstack, Gas type); /** * Whether or not this item can give a gas receiver a certain type of gas. @@ -47,7 +47,7 @@ public interface IGasItem * @param type - the type of gas the tank can provide * @return if the item can provide gas */ - public boolean canProvideGas(ItemStack itemstack, Gas type); + boolean canProvideGas(ItemStack itemstack, Gas type); /** * Get the gas of a declared type. @@ -55,7 +55,7 @@ public interface IGasItem * @param data - ItemStack parameter if necessary * @return gas stored */ - public GasStack getGas(ItemStack itemstack); + GasStack getGas(ItemStack itemstack); /** * Set the gas of a declared type to a new amount; @@ -63,7 +63,7 @@ public interface IGasItem * @param data - ItemStack parameter if necessary * @param amount - amount to store */ - public void setGas(ItemStack itemstack, GasStack stack); + void setGas(ItemStack itemstack, GasStack stack); /** * Gets the maximum amount of gas this tile entity can store. @@ -71,5 +71,5 @@ public interface IGasItem * @param data - ItemStack parameter if necessary * @return maximum gas */ - public int getMaxGas(ItemStack itemstack); + int getMaxGas(ItemStack itemstack); } diff --git a/src/main/java/mekanism/api/gas/ITubeConnection.java b/src/main/java/mekanism/api/gas/ITubeConnection.java index 2f71dbe5c..3b7f5558d 100644 --- a/src/main/java/mekanism/api/gas/ITubeConnection.java +++ b/src/main/java/mekanism/api/gas/ITubeConnection.java @@ -14,5 +14,5 @@ public interface ITubeConnection * @param side - orientation to check * @return if a tube can connect */ - public boolean canTubeConnect(EnumFacing side); + boolean canTubeConnect(EnumFacing side); } diff --git a/src/main/java/mekanism/api/infuse/InfuseRegistry.java b/src/main/java/mekanism/api/infuse/InfuseRegistry.java index 308b9c5be..62928ecf7 100644 --- a/src/main/java/mekanism/api/infuse/InfuseRegistry.java +++ b/src/main/java/mekanism/api/infuse/InfuseRegistry.java @@ -97,7 +97,7 @@ public class InfuseRegistry * Gets the private map for InfuseObjects. * @return private InfuseObject map */ - public static final Map getObjectMap() + public static Map getObjectMap() { return infuseObjects; } @@ -106,7 +106,7 @@ public class InfuseRegistry * Gets the private map for InfuseTypes. * @return private InfuseType map */ - public static final Map getInfuseMap() + public static Map getInfuseMap() { return infuseTypes; } diff --git a/src/main/java/mekanism/api/lasers/ILaserReceptor.java b/src/main/java/mekanism/api/lasers/ILaserReceptor.java index 7412ff24c..cb8fa4e61 100644 --- a/src/main/java/mekanism/api/lasers/ILaserReceptor.java +++ b/src/main/java/mekanism/api/lasers/ILaserReceptor.java @@ -4,7 +4,7 @@ import net.minecraft.util.EnumFacing; public interface ILaserReceptor { - public void receiveLaserEnergy(double energy, EnumFacing side); + void receiveLaserEnergy(double energy, EnumFacing side); - public boolean canLasersDig(); + boolean canLasersDig(); } diff --git a/src/main/java/mekanism/api/transmitters/IBlockableConnection.java b/src/main/java/mekanism/api/transmitters/IBlockableConnection.java index 59d4e7f30..3c7190fe8 100644 --- a/src/main/java/mekanism/api/transmitters/IBlockableConnection.java +++ b/src/main/java/mekanism/api/transmitters/IBlockableConnection.java @@ -5,7 +5,7 @@ import net.minecraft.util.EnumFacing; public interface IBlockableConnection { - public boolean canConnectMutual(EnumFacing side); + boolean canConnectMutual(EnumFacing side); - public boolean canConnect(EnumFacing side); + boolean canConnect(EnumFacing side); } diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index cca094203..9eac4adc7 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -8,59 +8,59 @@ import net.minecraft.world.World; public interface IGridTransmitter> extends ITransmitter { - public boolean hasTransmitterNetwork(); + boolean hasTransmitterNetwork(); /** * Gets the network currently in use by this transmitter segment. * @return network this transmitter is using */ - public N getTransmitterNetwork(); + N getTransmitterNetwork(); /** * Sets this transmitter segment's network to a new value. * @param network - network to set to */ - public void setTransmitterNetwork(N network); + void setTransmitterNetwork(N network); - public void setRequestsUpdate(); + void setRequestsUpdate(); - public int getTransmitterNetworkSize(); + int getTransmitterNetworkSize(); - public int getTransmitterNetworkAcceptorSize(); + int getTransmitterNetworkAcceptorSize(); - public String getTransmitterNetworkNeeded(); + String getTransmitterNetworkNeeded(); - public String getTransmitterNetworkFlow(); + String getTransmitterNetworkFlow(); - public String getTransmitterNetworkBuffer(); + String getTransmitterNetworkBuffer(); - public double getTransmitterNetworkCapacity(); + double getTransmitterNetworkCapacity(); - public int getCapacity(); + int getCapacity(); - public World world(); + World world(); - public Coord4D coord(); + Coord4D coord(); - public Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side); + Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side); - public A getAcceptor(EnumFacing side); + A getAcceptor(EnumFacing side); - public boolean isValid(); + boolean isValid(); - public boolean isOrphan(); + boolean isOrphan(); - public void setOrphan(boolean orphaned); + void setOrphan(boolean orphaned); - public N createEmptyNetwork(); + N createEmptyNetwork(); - public N mergeNetworks(Collection toMerge); + N mergeNetworks(Collection toMerge); - public N getExternalNetwork(Coord4D from); + N getExternalNetwork(Coord4D from); - public void takeShare(); + void takeShare(); - public void updateShare(); + void updateShare(); - public Object getBuffer(); + Object getBuffer(); } diff --git a/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java b/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java index 38cd63702..69c16ebe7 100644 --- a/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java +++ b/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java @@ -2,9 +2,9 @@ package mekanism.api.transmitters; public interface INetworkDataHandler { - public String getNeededInfo(); + String getNeededInfo(); - public String getStoredInfo(); + String getStoredInfo(); - public String getFlowInfo(); + String getFlowInfo(); } diff --git a/src/main/java/mekanism/api/transmitters/ITransmitter.java b/src/main/java/mekanism/api/transmitters/ITransmitter.java index cddc76a7a..cded99fa2 100644 --- a/src/main/java/mekanism/api/transmitters/ITransmitter.java +++ b/src/main/java/mekanism/api/transmitters/ITransmitter.java @@ -7,5 +7,5 @@ public interface ITransmitter * * @return TransmissionType this transmitter uses */ - public TransmissionType getTransmissionType(); + TransmissionType getTransmissionType(); } diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java index e72d24f1d..b218a0513 100644 --- a/src/main/java/mekanism/api/transmitters/TransmissionType.java +++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java @@ -14,7 +14,7 @@ public enum TransmissionType private String name; private String transmission; - private TransmissionType(String n, String t) + TransmissionType(String n, String t) { name = n; transmission = t; @@ -67,4 +67,4 @@ public enum TransmissionType return false; } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index ce81a4c09..eed3bca90 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -161,7 +161,7 @@ public final class HolidayManager } } - public static enum Month + public enum Month { JANUARY("January"), FEBRUARY("February"), @@ -178,7 +178,7 @@ public final class HolidayManager private final String name; - private Month(String n) + Month(String n) { name = n; } diff --git a/src/main/java/mekanism/client/gui/IGuiWrapper.java b/src/main/java/mekanism/client/gui/IGuiWrapper.java index f5d33f44a..5153d2672 100644 --- a/src/main/java/mekanism/client/gui/IGuiWrapper.java +++ b/src/main/java/mekanism/client/gui/IGuiWrapper.java @@ -7,13 +7,13 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; public interface IGuiWrapper { - public void drawTexturedRect(int x, int y, int u, int v, int w, int h); + void drawTexturedRect(int x, int y, int u, int v, int w, int h); - public void drawTexturedRectFromIcon(int x, int y, TextureAtlasSprite icon, int w, int h); + void drawTexturedRectFromIcon(int x, int y, TextureAtlasSprite icon, int w, int h); - public void displayTooltip(String s, int xAxis, int yAxis); + void displayTooltip(String s, int xAxis, int yAxis); - public void displayTooltips(List list, int xAxis, int yAxis); + void displayTooltips(List list, int xAxis, int yAxis); - public FontRenderer getFont(); + FontRenderer getFont(); } diff --git a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java index cf0c846fc..6589e5a35 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java @@ -83,7 +83,7 @@ public class GuiBoilerTab extends GuiElement } } - public static enum BoilerTab + public enum BoilerTab { MAIN("GuiGasesTab.png", 54, "gui.main"), STAT("GuiStatsTab.png", 55, "gui.stats"); @@ -92,7 +92,7 @@ public class GuiBoilerTab extends GuiElement private int guiId; private String desc; - private BoilerTab(String s, int id, String s1) + BoilerTab(String s, int id, String s1) { path = s; guiId = id; @@ -114,4 +114,4 @@ public class GuiBoilerTab extends GuiElement return LangUtils.localize(desc); } } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 2ff52b160..c9f9708eb 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -137,9 +137,9 @@ public abstract class GuiElement public abstract void mouseClicked(int xAxis, int yAxis, int button); - public static interface IInfoHandler + public interface IInfoHandler { - public List getInfo(); + List getInfo(); } public static class Rectangle4i diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index e4105fc40..7f06e0443 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -55,8 +55,8 @@ public class GuiEnergyGauge extends GuiGauge return infoHandler.getEnergyStorage().getEnergy() > 0 ? MekanismUtils.getEnergyDisplay(infoHandler.getEnergyStorage().getEnergy(), infoHandler.getEnergyStorage().getMaxEnergy()) : LangUtils.localize("gui.empty"); } - public static interface IEnergyInfoHandler + public interface IEnergyInfoHandler { - public IStrictEnergyStorage getEnergyStorage(); + IStrictEnergyStorage getEnergyStorage(); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index 6a56bceb5..f50ae957b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -132,8 +132,8 @@ public class GuiFluidGauge extends GuiGauge return infoHandler.getTank().getFluid() != null ? LangUtils.localizeFluidStack(infoHandler.getTank().getFluid()) + ": " + amountStr : LangUtils.localize("gui.empty"); } - public static interface IFluidInfoHandler + public interface IFluidInfoHandler { - public FluidTank getTank(); + FluidTank getTank(); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index e0b67fb96..40a9841a4 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -112,8 +112,8 @@ public class GuiGasGauge extends GuiGauge return (infoHandler.getTank().getGas() != null) ? infoHandler.getTank().getGas().getGas().getLocalizedName() + ": " + infoHandler.getTank().getStored() : LangUtils.localize("gui.empty"); } - public static interface IGasInfoHandler + public interface IGasInfoHandler { - public GasTank getTank(); + GasTank getTank(); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index b87a17c10..b174ceb75 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -187,7 +187,7 @@ public abstract class GuiGauge extends GuiElement return new Rectangle4i(guiWidth + xLocation, guiHeight + yLocation, width, height); } - public static enum Type + public enum Type { STANDARD(null, 18, 60, 0, 0, 1, "GuiGaugeStandard.png"), STANDARD_YELLOW(EnumColor.YELLOW, 18, 60, 0, 60, 1, "GuiGaugeStandard.png"), @@ -213,7 +213,7 @@ public abstract class GuiGauge extends GuiElement public int number; public String textureLocation; - private Type(EnumColor c, int w, int h, int tx, int ty, int n, String t) + Type(EnumColor c, int w, int h, int tx, int ty, int n, String t) { color = c; width = w; diff --git a/src/main/java/mekanism/client/gui/element/GuiGraph.java b/src/main/java/mekanism/client/gui/element/GuiGraph.java index 9ba0945ba..13c59436a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGraph.java +++ b/src/main/java/mekanism/client/gui/element/GuiGraph.java @@ -143,8 +143,8 @@ public class GuiGraph extends GuiElement } } - public static interface GraphDataHandler + public interface GraphDataHandler { - public String getDataDisplay(int data); + String getDataDisplay(int data); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java index e2a5cc268..3ee347ae1 100644 --- a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java @@ -83,7 +83,7 @@ public class GuiMatrixTab extends GuiElement } } - public static enum MatrixTab + public enum MatrixTab { MAIN("GuiEnergyTab.png", 49, "gui.main"), STAT("GuiStatsTab.png", 50, "gui.stats"); @@ -92,7 +92,7 @@ public class GuiMatrixTab extends GuiElement private int guiId; private String desc; - private MatrixTab(String s, int id, String s1) + MatrixTab(String s, int id, String s1) { path = s; guiId = id; diff --git a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java index aeebc111d..cbb2aa6dc 100644 --- a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java @@ -42,14 +42,14 @@ public class GuiNumberGauge extends GuiGauge } - public static interface INumberInfoHandler + public interface INumberInfoHandler { - public TextureAtlasSprite getIcon(); + TextureAtlasSprite getIcon(); - public double getLevel(); + double getLevel(); - public double getMaxLevel(); + double getMaxLevel(); - public String getText(double level); + String getText(double level); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiProgress.java b/src/main/java/mekanism/client/gui/element/GuiProgress.java index 92b02f91e..7a531f87a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/element/GuiProgress.java @@ -92,7 +92,7 @@ public class GuiProgress extends GuiElement public int textureX; public int textureY; - private ProgressBar(int w, int h, int u, int v) + ProgressBar(int w, int h, int u, int v) { width = w; height = h; diff --git a/src/main/java/mekanism/client/gui/element/GuiSlot.java b/src/main/java/mekanism/client/gui/element/GuiSlot.java index ffb54ba15..b383ed7df 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSlot.java +++ b/src/main/java/mekanism/client/gui/element/GuiSlot.java @@ -90,7 +90,7 @@ public class GuiSlot extends GuiElement public int textureX; public int textureY; - private SlotType(int w, int h, int x, int y) + SlotType(int w, int h, int x, int y) { width = w; height = h; @@ -115,7 +115,7 @@ public class GuiSlot extends GuiElement public int textureX; public int textureY; - private SlotOverlay(int w, int h, int x, int y) + SlotOverlay(int w, int h, int x, int y) { width = w; height = h; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 7779be7e4..24a5e592a 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -57,7 +57,7 @@ public class MekanismRenderer public enum FluidType { STILL, - FLOWING; + FLOWING } public static TextureAtlasSprite[] colors = new TextureAtlasSprite[256]; @@ -552,8 +552,8 @@ public class MekanismRenderer return TextureMap.LOCATION_BLOCKS_TEXTURE; } - public static interface ICustomBlockIcon + public interface ICustomBlockIcon { - public ResourceLocation getIcon(ItemStack stack, int side); + ResourceLocation getIcon(ItemStack stack, int side); } } diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index 3fe36f34d..7b47c6c58 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -195,7 +195,7 @@ public class ModelCustomArmor extends ModelBiped return false; } - public static enum ArmorModel + public enum ArmorModel { JETPACK(1, MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")), ARMOREDJETPACK(1, MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")), @@ -212,7 +212,7 @@ public class ModelCustomArmor extends ModelBiped public static ModelScubaTank scubaTankModel = new ModelScubaTank(); public static ModelFreeRunners freeRunnersModel = new ModelFreeRunners(); - private ArmorModel(int i, ResourceLocation r) + ArmorModel(int i, ResourceLocation r) { armorSlot = i; resource = r; diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java index a976661e2..0a093b7dc 100644 --- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -66,7 +66,7 @@ public class RenderResizableCuboid { private final VertexFormatElement element; - private EnumShadeType(VertexFormatElement element) { + EnumShadeType(VertexFormatElement element) { this.element = element; } } diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java index d5cfd1599..abe51282b 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java @@ -56,7 +56,7 @@ public class MekanismOBJModel extends OBJModel return ret; } - public static enum OBJModelType + public enum OBJModelType { GLOW_PANEL, TRANSMITTER diff --git a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java index 99885e230..8405637fa 100644 --- a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java +++ b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java @@ -176,7 +176,7 @@ public abstract class OBJBakedModelBase extends OBJBakedModel return quadList; } - public static final void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, VertexFormat format, float[] color) + public static void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, VertexFormat format, float[] color) { for(int e = 0; e < format.getElementCount(); e++) { diff --git a/src/main/java/mekanism/client/sound/IResettableSound.java b/src/main/java/mekanism/client/sound/IResettableSound.java index e913bc9a8..35e59aadb 100644 --- a/src/main/java/mekanism/client/sound/IResettableSound.java +++ b/src/main/java/mekanism/client/sound/IResettableSound.java @@ -7,5 +7,5 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public interface IResettableSound extends ITickableSound { - public void reset(); + void reset(); } diff --git a/src/main/java/mekanism/client/sound/ISoundSource.java b/src/main/java/mekanism/client/sound/ISoundSource.java index 4d09e634c..80e9b4297 100644 --- a/src/main/java/mekanism/client/sound/ISoundSource.java +++ b/src/main/java/mekanism/client/sound/ISoundSource.java @@ -9,23 +9,23 @@ import net.minecraftforge.fml.relauncher.SideOnly; public interface ISoundSource { @SideOnly(Side.CLIENT) - public ResourceLocation getSoundLocation(); + ResourceLocation getSoundLocation(); @SideOnly(Side.CLIENT) - public float getVolume(); + float getVolume(); @SideOnly(Side.CLIENT) - public float getFrequency(); + float getFrequency(); @SideOnly(Side.CLIENT) - public Vec3d getSoundPosition(); + Vec3d getSoundPosition(); @SideOnly(Side.CLIENT) - public boolean shouldRepeat(); + boolean shouldRepeat(); @SideOnly(Side.CLIENT) - public int getRepeatDelay(); + int getRepeatDelay(); @SideOnly(Side.CLIENT) - public AttenuationType getAttenuation(); + AttenuationType getAttenuation(); } diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index e7b38ddc0..3985f819e 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -31,7 +31,7 @@ public class SoundHandler public static Minecraft mc = Minecraft.getMinecraft(); - public static enum Channel + public enum Channel { JETPACK("jetpack", JetpackSound.class), GASMASK("gasMask", GasMaskSound.class), @@ -40,7 +40,7 @@ public class SoundHandler String channelName; Class soundClass; - private Channel(String name, Class clazz) + Channel(String name, Class clazz) { channelName = name; soundClass = clazz; diff --git a/src/main/java/mekanism/common/Resource.java b/src/main/java/mekanism/common/Resource.java index f54a5c833..48e4a5ddd 100644 --- a/src/main/java/mekanism/common/Resource.java +++ b/src/main/java/mekanism/common/Resource.java @@ -12,7 +12,7 @@ public enum Resource private String name; - private Resource(String s) + Resource(String s) { name = s; } diff --git a/src/main/java/mekanism/common/SideData.java b/src/main/java/mekanism/common/SideData.java index 68a174dcc..c860fbb3d 100644 --- a/src/main/java/mekanism/common/SideData.java +++ b/src/main/java/mekanism/common/SideData.java @@ -92,10 +92,10 @@ public class SideData return (GasTank)tanks[0]; } - public static enum IOState + public enum IOState { INPUT, OUTPUT, - OFF; + OFF } } diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 52bc7674b..11b92362f 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -25,7 +25,7 @@ public final class Tier /** The default tiers used in Mekanism. * @author aidancbrady */ - public static enum BaseTier implements IStringSerializable + public enum BaseTier implements IStringSerializable { BASIC("Basic", EnumColor.BRIGHT_GREEN), ADVANCED("Advanced", EnumColor.DARK_RED), @@ -56,7 +56,7 @@ public final class Tier private String name; private EnumColor color; - private BaseTier(String s, EnumColor c) + BaseTier(String s, EnumColor c) { name = s; color = c; @@ -69,7 +69,7 @@ public final class Tier } } - public static enum EnergyCubeTier implements ITier, IStringSerializable + public enum EnergyCubeTier implements ITier, IStringSerializable { BASIC(2000000, 800), ADVANCED(8000000, 3200), @@ -83,7 +83,7 @@ public final class Tier public double output; private double baseOutput; - private EnergyCubeTier(double max, double out) + EnergyCubeTier(double max, double out) { baseMaxEnergy = maxEnergy = max; baseOutput = output = out; @@ -132,7 +132,7 @@ public final class Tier } } - public static enum InductionCellTier implements ITier + public enum InductionCellTier implements ITier { BASIC(1E9D), ADVANCED(8E9D), @@ -142,7 +142,7 @@ public final class Tier public double maxEnergy; private double baseMaxEnergy; - private InductionCellTier(double max) + InductionCellTier(double max) { baseMaxEnergy = maxEnergy = max; } @@ -172,7 +172,7 @@ public final class Tier } } - public static enum InductionProviderTier implements ITier + public enum InductionProviderTier implements ITier { BASIC(64000), ADVANCED(512000), @@ -182,7 +182,7 @@ public final class Tier public double output; private double baseOutput; - private InductionProviderTier(double out) + InductionProviderTier(double out) { baseOutput = output = out; } @@ -212,7 +212,7 @@ public final class Tier } } - public static enum FactoryTier + public enum FactoryTier { BASIC(3, new ResourceLocation("mekanism", "gui/factory/GuiBasicFactory.png")), ADVANCED(5, new ResourceLocation("mekanism", "gui/factory/GuiAdvancedFactory.png")), @@ -240,14 +240,14 @@ public final class Tier return BaseTier.values()[ordinal()]; } - private FactoryTier(int process, ResourceLocation gui) + FactoryTier(int process, ResourceLocation gui) { processes = process; guiLocation = gui; } } - public static enum CableTier implements ITier + public enum CableTier implements ITier { BASIC(3200), ADVANCED(12800), @@ -257,7 +257,7 @@ public final class Tier public int cableCapacity; private int baseCapacity; - private CableTier(int capacity) + CableTier(int capacity) { baseCapacity = cableCapacity = capacity; } @@ -300,7 +300,7 @@ public final class Tier } } - public static enum PipeTier implements ITier + public enum PipeTier implements ITier { BASIC(1000, 100), ADVANCED(4000, 400), @@ -313,7 +313,7 @@ public final class Tier public int pipePullAmount; private int basePull; - private PipeTier(int capacity, int pullAmount) + PipeTier(int capacity, int pullAmount) { baseCapacity = pipeCapacity = capacity; basePull = pipePullAmount = pullAmount; @@ -360,7 +360,7 @@ public final class Tier } } - public static enum TubeTier implements ITier + public enum TubeTier implements ITier { BASIC(256, 64), ADVANCED(1024, 256), @@ -373,7 +373,7 @@ public final class Tier public int tubePullAmount; private int basePull; - private TubeTier(int capacity, int pullAmount) + TubeTier(int capacity, int pullAmount) { baseCapacity = tubeCapacity = capacity; basePull = tubePullAmount = pullAmount; @@ -420,7 +420,7 @@ public final class Tier } } - public static enum TransporterTier implements ITier + public enum TransporterTier implements ITier { BASIC(1, 5), ADVANCED(16, 10), @@ -433,7 +433,7 @@ public final class Tier public int speed; private int baseSpeed; - private TransporterTier(int pull, int s) + TransporterTier(int pull, int s) { basePull = pullAmount = pull; baseSpeed = speed = s; @@ -480,7 +480,7 @@ public final class Tier } } - public static enum ConductorTier implements ITier + public enum ConductorTier implements ITier { BASIC(5, 1, 10, new ColourRGBA(0.2, 0.2, 0.2, 1)), ADVANCED(5, 1, 400, new ColourRGBA(0.2, 0.2, 0.2, 1)), @@ -498,7 +498,7 @@ public final class Tier public ColourRGBA baseColour; - private ConductorTier(double inversek, double inverseC, double insulationInversek, ColourRGBA colour) + ConductorTier(double inversek, double inverseC, double insulationInversek, ColourRGBA colour) { baseConduction = inverseConduction = inversek; baseHeatCapacity = inverseHeatCapacity = inverseC; @@ -551,7 +551,7 @@ public final class Tier } } - public static enum FluidTankTier implements ITier + public enum FluidTankTier implements ITier { BASIC(14000, 400), ADVANCED(28000, 800), @@ -565,7 +565,7 @@ public final class Tier public int output; private int baseOutput; - private FluidTankTier(int s, int o) + FluidTankTier(int s, int o) { baseStorage = storage = s; baseOutput = output = o; @@ -599,7 +599,7 @@ public final class Tier } } - public static enum GasTankTier implements ITier, IStringSerializable + public enum GasTankTier implements ITier, IStringSerializable { BASIC(64000, 256), ADVANCED(128000, 512), @@ -613,7 +613,7 @@ public final class Tier public int output; private int baseOutput; - private GasTankTier(int s, int o) + GasTankTier(int s, int o) { baseStorage = storage = s; baseOutput = output = o; @@ -653,7 +653,7 @@ public final class Tier } } - public static enum BinTier implements ITier + public enum BinTier implements ITier { BASIC(4096), ADVANCED(8192), @@ -664,7 +664,7 @@ public final class Tier public int storage; private int baseStorage; - private BinTier(int s) + BinTier(int s) { baseStorage = storage = s; } @@ -746,14 +746,14 @@ public final class Tier } } - public static interface ITier + public interface ITier { - public BaseTier getBaseTier(); + BaseTier getBaseTier(); - public void loadConfig(); + void loadConfig(); - public void readConfig(ByteBuf dataStream); + void readConfig(ByteBuf dataStream); - public void writeConfig(ByteBuf dataStream); + void writeConfig(ByteBuf dataStream); } } diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index c7f57a361..db339e52c 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -28,7 +28,7 @@ public enum Upgrade private int maxStack; private EnumColor color; - private Upgrade(String s, int max, EnumColor c) + Upgrade(String s, int max, EnumColor c) { name = s; maxStack = max; @@ -172,8 +172,8 @@ public enum Upgrade return compound; } - public static interface IUpgradeInfoHandler + public interface IUpgradeInfoHandler { - public List getInfo(Upgrade upgrade); + List getInfo(Upgrade upgrade); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/base/IActiveState.java b/src/main/java/mekanism/common/base/IActiveState.java index 804e7f9c3..e928b8789 100644 --- a/src/main/java/mekanism/common/base/IActiveState.java +++ b/src/main/java/mekanism/common/base/IActiveState.java @@ -11,19 +11,19 @@ public interface IActiveState * Gets the active state as a boolean. * @return active state */ - public boolean getActive(); + boolean getActive(); /** * Sets the active state to a new value. * @param active - new active state */ - public void setActive(boolean active); + void setActive(boolean active); /** * Whether or not this block has a visual effect when it is on it's active state. Used for rendering. * @return if the block has a visual effect in it's active state */ - public boolean renderUpdate(); + boolean renderUpdate(); - public boolean lightUpdate(); + boolean lightUpdate(); } diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 07a5c776e..acd74e41f 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -24,15 +24,15 @@ import net.minecraftforge.fml.common.Optional.InterfaceList; }) public interface IAdvancedBoundingBlock extends ICapabilityProvider, IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData, ISecurityTile { - public int[] getBoundSlots(BlockPos location, EnumFacing side); + int[] getBoundSlots(BlockPos location, EnumFacing side); - public boolean canBoundInsert(BlockPos location, int i, ItemStack itemstack); + boolean canBoundInsert(BlockPos location, int i, ItemStack itemstack); - public boolean canBoundExtract(BlockPos location, int i, ItemStack itemstack, EnumFacing side); + boolean canBoundExtract(BlockPos location, int i, ItemStack itemstack, EnumFacing side); - public boolean canBoundReceiveEnergy(BlockPos location, EnumFacing side); + boolean canBoundReceiveEnergy(BlockPos location, EnumFacing side); - public void onPower(); + void onPower(); - public void onNoPower(); + void onNoPower(); } diff --git a/src/main/java/mekanism/common/base/IBlockType.java b/src/main/java/mekanism/common/base/IBlockType.java index 88ff9015c..02defd4af 100644 --- a/src/main/java/mekanism/common/base/IBlockType.java +++ b/src/main/java/mekanism/common/base/IBlockType.java @@ -6,7 +6,7 @@ package mekanism.common.base; public interface IBlockType { - public String getBlockName(); + String getBlockName(); // public Collection getRecipes(); // @@ -14,5 +14,5 @@ public interface IBlockType // // public void addRecipe(ShapedMekanismRecipe recipe); - public boolean isEnabled(); + boolean isEnabled(); } diff --git a/src/main/java/mekanism/common/base/IBoundingBlock.java b/src/main/java/mekanism/common/base/IBoundingBlock.java index 4792305dc..cd1aaf9ce 100644 --- a/src/main/java/mekanism/common/base/IBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IBoundingBlock.java @@ -11,10 +11,10 @@ public interface IBoundingBlock /** * Called when the main block is placed. */ - public void onPlace(); + void onPlace(); /** * Called when any part of the structure is broken. */ - public void onBreak(); + void onBreak(); } diff --git a/src/main/java/mekanism/common/base/IChunkLoadHandler.java b/src/main/java/mekanism/common/base/IChunkLoadHandler.java index 9964514b7..9eb4af2e5 100644 --- a/src/main/java/mekanism/common/base/IChunkLoadHandler.java +++ b/src/main/java/mekanism/common/base/IChunkLoadHandler.java @@ -2,5 +2,5 @@ package mekanism.common.base; public interface IChunkLoadHandler { - public void onChunkLoad(); + void onChunkLoad(); } diff --git a/src/main/java/mekanism/common/base/IElectricMachine.java b/src/main/java/mekanism/common/base/IElectricMachine.java index f2dab9cc2..7aff52c75 100644 --- a/src/main/java/mekanism/common/base/IElectricMachine.java +++ b/src/main/java/mekanism/common/base/IElectricMachine.java @@ -17,25 +17,25 @@ public interface IElectricMachine, OUTPUT exte /** * Update call for machines. Use instead of updateEntity() - it's called every tick. */ - public void onUpdate(); + void onUpdate(); /** * Whether or not this machine can operate. * @return can operate */ - public boolean canOperate(RECIPE recipe); + boolean canOperate(RECIPE recipe); /** * Runs this machine's operation -- or smelts the item. */ - public void operate(RECIPE recipe); + void operate(RECIPE recipe); /** * Gets this machine's recipes. */ - public Map getRecipes(); + Map getRecipes(); - public RECIPE getRecipe(); + RECIPE getRecipe(); - public INPUT getInput(); + INPUT getInput(); } diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 75cba8e04..a20b4a142 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -25,9 +25,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList; }) public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory { - public boolean sideIsOutput(EnumFacing side); + boolean sideIsOutput(EnumFacing side); - public boolean sideIsConsumer(EnumFacing side); + boolean sideIsConsumer(EnumFacing side); - public double getMaxOutput(); + double getMaxOutput(); } diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 21647221b..e6678c5c2 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -36,16 +36,16 @@ public interface IFactory * @param itemStack - stack to check * @return RecipeType ordinal */ - public int getRecipeType(ItemStack itemStack); + int getRecipeType(ItemStack itemStack); /** * Sets the recipe type of this Smelting Factory to a new value. * @param type - RecipeType ordinal * @param itemStack - stack to set */ - public void setRecipeType(int type, ItemStack itemStack); + void setRecipeType(int type, ItemStack itemStack); - public static enum RecipeType implements IStringSerializable + enum RecipeType implements IStringSerializable { SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER, false, false, Recipe.ENERGIZED_SMELTER), ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER, false, false, Recipe.ENRICHMENT_CHAMBER), @@ -266,7 +266,7 @@ public interface IFactory return type; } - private RecipeType(String s, String s1, MachineType t, boolean b, boolean b1, Recipe r) + RecipeType(String s, String s1, MachineType t, boolean b, boolean b1, Recipe r) { name = s; sound = new ResourceLocation("mekanism", "tile.machine." + s1); diff --git a/src/main/java/mekanism/common/base/IFluidContainerManager.java b/src/main/java/mekanism/common/base/IFluidContainerManager.java index 65cc5a0a2..88402198c 100644 --- a/src/main/java/mekanism/common/base/IFluidContainerManager.java +++ b/src/main/java/mekanism/common/base/IFluidContainerManager.java @@ -4,7 +4,7 @@ import mekanism.common.util.FluidContainerUtils.ContainerEditMode; public interface IFluidContainerManager { - public ContainerEditMode getContainerEditMode(); + ContainerEditMode getContainerEditMode(); - public void setContainerEditMode(ContainerEditMode mode); + void setContainerEditMode(ContainerEditMode mode); } diff --git a/src/main/java/mekanism/common/base/IFluidItemWrapper.java b/src/main/java/mekanism/common/base/IFluidItemWrapper.java index c21861ac9..7f71333e4 100644 --- a/src/main/java/mekanism/common/base/IFluidItemWrapper.java +++ b/src/main/java/mekanism/common/base/IFluidItemWrapper.java @@ -5,11 +5,11 @@ import net.minecraftforge.fluids.FluidStack; public interface IFluidItemWrapper { - public FluidStack getFluid(ItemStack container); + FluidStack getFluid(ItemStack container); - public int getCapacity(ItemStack container); + int getCapacity(ItemStack container); - public int fill(ItemStack container, FluidStack resource, boolean doFill); + int fill(ItemStack container, FluidStack resource, boolean doFill); - public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain); + FluidStack drain(ItemStack container, int maxDrain, boolean doDrain); } diff --git a/src/main/java/mekanism/common/base/IGuiProvider.java b/src/main/java/mekanism/common/base/IGuiProvider.java index c12a85789..60cd39fcf 100644 --- a/src/main/java/mekanism/common/base/IGuiProvider.java +++ b/src/main/java/mekanism/common/base/IGuiProvider.java @@ -15,7 +15,7 @@ public interface IGuiProvider * @param pos - gui's position * @return the Container of the GUI */ - public Container getServerGui(int ID, EntityPlayer player, World world, BlockPos pos); + Container getServerGui(int ID, EntityPlayer player, World world, BlockPos pos); /** * Get the actual interface for a GUI. Client-only. @@ -25,5 +25,5 @@ public interface IGuiProvider * @param pos - gui's position * @return the GuiScreen of the GUI */ - public Object getClientGui(int ID, EntityPlayer player, World world, BlockPos pos); + Object getClientGui(int ID, EntityPlayer player, World world, BlockPos pos); } diff --git a/src/main/java/mekanism/common/base/IHasSound.java b/src/main/java/mekanism/common/base/IHasSound.java index 4d9e12ebe..adcbf8e14 100644 --- a/src/main/java/mekanism/common/base/IHasSound.java +++ b/src/main/java/mekanism/common/base/IHasSound.java @@ -11,8 +11,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public interface IHasSound { @SideOnly(Side.CLIENT) - public SoundWrapper getSound(); + SoundWrapper getSound(); @SideOnly(Side.CLIENT) - public boolean shouldPlaySound(); + boolean shouldPlaySound(); } diff --git a/src/main/java/mekanism/common/base/IItemNetwork.java b/src/main/java/mekanism/common/base/IItemNetwork.java index 91f208c02..a2a8695c4 100644 --- a/src/main/java/mekanism/common/base/IItemNetwork.java +++ b/src/main/java/mekanism/common/base/IItemNetwork.java @@ -5,5 +5,5 @@ import net.minecraft.item.ItemStack; public interface IItemNetwork { - public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception; + void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception; } diff --git a/src/main/java/mekanism/common/base/ILogisticalTransporter.java b/src/main/java/mekanism/common/base/ILogisticalTransporter.java index 17d46136e..80256b2bf 100644 --- a/src/main/java/mekanism/common/base/ILogisticalTransporter.java +++ b/src/main/java/mekanism/common/base/ILogisticalTransporter.java @@ -14,19 +14,19 @@ import net.minecraft.util.EnumFacing; public interface ILogisticalTransporter extends IGridTransmitter, IBlockableConnection { - public TransitResponse insert(Coord4D original, TransitRequest request, EnumColor color, boolean doEmit, int min); + TransitResponse insert(Coord4D original, TransitRequest request, EnumColor color, boolean doEmit, int min); - public TransitResponse insertRR(TileEntityLogisticalSorter outputter, TransitRequest request, EnumColor color, boolean doEmit, int min); + TransitResponse insertRR(TileEntityLogisticalSorter outputter, TransitRequest request, EnumColor color, boolean doEmit, int min); - public void entityEntering(TransporterStack stack, int progress); + void entityEntering(TransporterStack stack, int progress); - public EnumColor getColor(); + EnumColor getColor(); - public void setColor(EnumColor c); + void setColor(EnumColor c); - public boolean canEmitTo(TileEntity tileEntity, EnumFacing side); + boolean canEmitTo(TileEntity tileEntity, EnumFacing side); - public boolean canReceiveFrom(TileEntity tileEntity, EnumFacing side); + boolean canReceiveFrom(TileEntity tileEntity, EnumFacing side); - public double getCost(); + double getCost(); } diff --git a/src/main/java/mekanism/common/base/IMetaItem.java b/src/main/java/mekanism/common/base/IMetaItem.java index a2c49c046..8e58cc225 100644 --- a/src/main/java/mekanism/common/base/IMetaItem.java +++ b/src/main/java/mekanism/common/base/IMetaItem.java @@ -2,7 +2,7 @@ package mekanism.common.base; public interface IMetaItem { - public String getTexture(int meta); + String getTexture(int meta); - public int getVariants(); + int getVariants(); } diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index 37a7a57e6..e54b5ee22 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -17,29 +17,29 @@ public interface IModule * Gets the version of the module. * @return the module's version */ - public Version getVersion(); + Version getVersion(); /** * Gets the name of the module. Note that this doesn't include "Mekanism" like the actual module's name does, just the * unique name. For example, MekanismGenerators returns "Generators" here. * @return unique name of the module */ - public String getName(); + String getName(); /** * Writes this module's configuration to a ConfigSync packet. * @param dataStream - the ByteBuf of the sync packet */ - public void writeConfig(ByteBuf dataStream) throws IOException; + void writeConfig(ByteBuf dataStream) throws IOException; /** * Reads this module's configuration from the original ConfigSync packet. * @param dataStream - the incoming ByteBuf of the sync packet */ - public void readConfig(ByteBuf dataStream) throws IOException; + void readConfig(ByteBuf dataStream) throws IOException; /** * Called when the player returns to the main menu. */ - public void resetClient(); + void resetClient(); } diff --git a/src/main/java/mekanism/common/base/IRedstoneControl.java b/src/main/java/mekanism/common/base/IRedstoneControl.java index 709ed0d66..74860540b 100644 --- a/src/main/java/mekanism/common/base/IRedstoneControl.java +++ b/src/main/java/mekanism/common/base/IRedstoneControl.java @@ -4,7 +4,7 @@ import mekanism.common.util.LangUtils; public interface IRedstoneControl { - public static enum RedstoneControl + enum RedstoneControl { DISABLED("control.disabled"), HIGH("control.high"), @@ -18,7 +18,7 @@ public interface IRedstoneControl return LangUtils.localize(display); } - private RedstoneControl(String s) + RedstoneControl(String s) { display = s; } @@ -28,28 +28,28 @@ public interface IRedstoneControl * Gets the RedstoneControl type from this block. * @return this block's RedstoneControl type */ - public RedstoneControl getControlType(); + RedstoneControl getControlType(); /** * Sets this block's RedstoneControl type to a new value. * @param type - RedstoneControl type to set */ - public void setControlType(RedstoneControl type); + void setControlType(RedstoneControl type); /** * If the block is getting powered or not by redstone (indirectly). * @return if the block is getting powered indirectly */ - public boolean isPowered(); + boolean isPowered(); /** * If the block was getting powered or not by redstone, last tick. * Used for PULSE mode. */ - public boolean wasPowered(); + boolean wasPowered(); /** * If the machine can be pulsed. */ - public boolean canPulse(); + boolean canPulse(); } diff --git a/src/main/java/mekanism/common/base/ISideConfiguration.java b/src/main/java/mekanism/common/base/ISideConfiguration.java index 1f989c157..2331b79d6 100644 --- a/src/main/java/mekanism/common/base/ISideConfiguration.java +++ b/src/main/java/mekanism/common/base/ISideConfiguration.java @@ -15,17 +15,17 @@ public interface ISideConfiguration * Gets the tile's configuration component. * @return the tile's configuration component */ - public TileComponentConfig getConfig(); + TileComponentConfig getConfig(); /** * Gets this machine's current orientation. * @return machine's current orientation */ - public EnumFacing getOrientation(); + EnumFacing getOrientation(); /** * Gets this machine's ejector. * @return */ - public TileComponentEjector getEjector(); + TileComponentEjector getEjector(); } diff --git a/src/main/java/mekanism/common/base/ISpecialBounds.java b/src/main/java/mekanism/common/base/ISpecialBounds.java index 2b4a0aff2..fb2be9c31 100644 --- a/src/main/java/mekanism/common/base/ISpecialBounds.java +++ b/src/main/java/mekanism/common/base/ISpecialBounds.java @@ -14,12 +14,12 @@ public interface ISpecialBounds * @param block - the Block instance the renderer pertains to. * @param metadata - metadata of the block being rendered */ - public void setRenderBounds(Block block, int metadata); + void setRenderBounds(Block block, int metadata); /** * Whether or not to call the default setBlockBoundsForItemRender() before rendering this block as an item. * @param metadata - metadata of the block being rendered * @return whether or not to call default bound setting on this block's metadata. */ - public boolean doDefaultBoundSetting(int metadata); + boolean doDefaultBoundSetting(int metadata); } diff --git a/src/main/java/mekanism/common/base/ISustainedData.java b/src/main/java/mekanism/common/base/ISustainedData.java index 4fb80bf43..c5683a496 100644 --- a/src/main/java/mekanism/common/base/ISustainedData.java +++ b/src/main/java/mekanism/common/base/ISustainedData.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; public interface ISustainedData { - public void writeSustainedData(ItemStack itemStack); + void writeSustainedData(ItemStack itemStack); - public void readSustainedData(ItemStack itemStack); + void readSustainedData(ItemStack itemStack); } diff --git a/src/main/java/mekanism/common/base/ISustainedInventory.java b/src/main/java/mekanism/common/base/ISustainedInventory.java index e8d2bbb54..58dba2913 100644 --- a/src/main/java/mekanism/common/base/ISustainedInventory.java +++ b/src/main/java/mekanism/common/base/ISustainedInventory.java @@ -14,12 +14,12 @@ public interface ISustainedInventory * @param nbtTags - NBTTagList value to set * @param data - ItemStack parameter if using on item */ - public void setInventory(NBTTagList nbtTags, Object... data); + void setInventory(NBTTagList nbtTags, Object... data); /** * Gets the inventory tag list from an item or block. * @param data - ItemStack parameter if using on item * @return inventory tag list */ - public NBTTagList getInventory(Object... data); + NBTTagList getInventory(Object... data); } diff --git a/src/main/java/mekanism/common/base/ISustainedTank.java b/src/main/java/mekanism/common/base/ISustainedTank.java index 2ba21c411..5b5702aba 100644 --- a/src/main/java/mekanism/common/base/ISustainedTank.java +++ b/src/main/java/mekanism/common/base/ISustainedTank.java @@ -14,19 +14,19 @@ public interface ISustainedTank * @param nbtTags - NBTTagList value to set * @param data - ItemStack parameter if using on item */ - public void setFluidStack(FluidStack fluidStack, Object... data); + void setFluidStack(FluidStack fluidStack, Object... data); /** * Gets the tank tag list from an item or block. * @param data - ItemStack parameter if using on item * @return inventory tag list */ - public FluidStack getFluidStack(Object... data); + FluidStack getFluidStack(Object... data); /** * Whether or not this block or item has an internal tank. * @param data - ItemStack parameter if using on item * @return if the block or item has an internal tank */ - public boolean hasTank(Object... data); + boolean hasTank(Object... data); } diff --git a/src/main/java/mekanism/common/base/ITankManager.java b/src/main/java/mekanism/common/base/ITankManager.java index 203ff4e64..547a77e73 100644 --- a/src/main/java/mekanism/common/base/ITankManager.java +++ b/src/main/java/mekanism/common/base/ITankManager.java @@ -12,9 +12,9 @@ import net.minecraftforge.fluids.FluidUtil; public interface ITankManager { - public Object[] getTanks(); + Object[] getTanks(); - public static class DropperHandler + class DropperHandler { public static void useDropper(EntityPlayer player, Object tank, int button) { @@ -116,4 +116,4 @@ public interface ITankManager } } } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/base/ITierItem.java b/src/main/java/mekanism/common/base/ITierItem.java index 31912c6d8..229300181 100644 --- a/src/main/java/mekanism/common/base/ITierItem.java +++ b/src/main/java/mekanism/common/base/ITierItem.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; public interface ITierItem { - public BaseTier getBaseTier(ItemStack stack); + BaseTier getBaseTier(ItemStack stack); - public void setBaseTier(ItemStack stack, BaseTier tier); + void setBaseTier(ItemStack stack, BaseTier tier); } diff --git a/src/main/java/mekanism/common/base/ITierUpgradeable.java b/src/main/java/mekanism/common/base/ITierUpgradeable.java index 591559591..3afa581f6 100644 --- a/src/main/java/mekanism/common/base/ITierUpgradeable.java +++ b/src/main/java/mekanism/common/base/ITierUpgradeable.java @@ -4,5 +4,5 @@ import mekanism.common.Tier.BaseTier; public interface ITierUpgradeable { - public boolean upgrade(BaseTier upgradeTier); + boolean upgrade(BaseTier upgradeTier); } diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index 0e5a747a8..278703286 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -8,15 +8,15 @@ import net.minecraft.nbt.NBTTagCompound; public interface ITileComponent { - public void tick(); + void tick(); - public void read(NBTTagCompound nbtTags); + void read(NBTTagCompound nbtTags); - public void read(ByteBuf dataStream); + void read(ByteBuf dataStream); - public void write(NBTTagCompound nbtTags); + void write(NBTTagCompound nbtTags); - public void write(ArrayList data); + void write(ArrayList data); - public void invalidate(); + void invalidate(); } diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index 7c3c9f0f7..a51af63fb 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -15,12 +15,12 @@ public interface ITileNetwork * Receive and manage a packet's data. * @param dataStream */ - public void handlePacketData(ByteBuf dataStream) throws Exception; + void handlePacketData(ByteBuf dataStream) throws Exception; /** * Gets an ArrayList of data this tile entity keeps synchronized with the client. * @param data - list of data * @return ArrayList */ - public ArrayList getNetworkedData(ArrayList data); + ArrayList getNetworkedData(ArrayList data); } diff --git a/src/main/java/mekanism/common/base/IUpgradeItem.java b/src/main/java/mekanism/common/base/IUpgradeItem.java index ec33efa5a..71bd31914 100644 --- a/src/main/java/mekanism/common/base/IUpgradeItem.java +++ b/src/main/java/mekanism/common/base/IUpgradeItem.java @@ -5,5 +5,5 @@ import net.minecraft.item.ItemStack; public interface IUpgradeItem { - public Upgrade getUpgradeType(ItemStack stack); + Upgrade getUpgradeType(ItemStack stack); } diff --git a/src/main/java/mekanism/common/base/IUpgradeTile.java b/src/main/java/mekanism/common/base/IUpgradeTile.java index e278d77f7..447e63eea 100644 --- a/src/main/java/mekanism/common/base/IUpgradeTile.java +++ b/src/main/java/mekanism/common/base/IUpgradeTile.java @@ -4,5 +4,5 @@ import mekanism.common.tile.component.TileComponentUpgrade; public interface IUpgradeTile { - public TileComponentUpgrade getComponent(); + TileComponentUpgrade getComponent(); } diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index adeb23f4b..6f85904d4 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -50,7 +50,7 @@ public class BlockStateBasic extends ExtendedBlockState super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty, tierProperty}, new IUnlistedProperty[] {}); } - public static enum BasicBlock + public enum BasicBlock { BASIC_BLOCK_1, BASIC_BLOCK_2; @@ -81,7 +81,7 @@ public class BlockStateBasic extends ExtendedBlockState } } - public static enum BasicBlockType implements IStringSerializable + 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), @@ -121,7 +121,7 @@ public class BlockStateBasic extends ExtendedBlockState public boolean tiers; public boolean isBeaconBase; - private BasicBlockType(BasicBlock block, int metadata, String s, Class tileClass, boolean hasDesc, Predicate facingAllowed, boolean activeState, boolean t, boolean beaconBase) + BasicBlockType(BasicBlock block, int metadata, String s, Class tileClass, boolean hasDesc, Predicate facingAllowed, boolean activeState, boolean t, boolean beaconBase) { blockType = block; meta = metadata; diff --git a/src/main/java/mekanism/common/block/states/BlockStateOre.java b/src/main/java/mekanism/common/block/states/BlockStateOre.java index 012dd40d5..1317458b4 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateOre.java +++ b/src/main/java/mekanism/common/block/states/BlockStateOre.java @@ -17,7 +17,7 @@ public class BlockStateOre extends BlockStateContainer super(block, typeProperty); } - public static enum EnumOreType implements IStringSerializable + public enum EnumOreType implements IStringSerializable { OSMIUM, COPPER, diff --git a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java index 042dd73cc..96e37dfff 100644 --- a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java +++ b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java @@ -19,7 +19,7 @@ public class BlockStatePlastic extends BlockStateContainer super(block, colorProperty); } - public static enum PlasticBlockType implements IStringSerializable + public enum PlasticBlockType implements IStringSerializable { PLASTIC, SLICK, diff --git a/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java b/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java index 8950e45f2..6a6cd03b5 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java +++ b/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java @@ -42,7 +42,7 @@ public class BlockStateTransmitter extends ExtendedBlockState private boolean transparencyRender; private boolean tiers; - private TransmitterType(String name, Size s, TransmissionType type, boolean transparency, boolean b) + TransmitterType(String name, Size s, TransmissionType type, boolean transparency, boolean b) { unlocalizedName = name; size = s; @@ -82,14 +82,14 @@ public class BlockStateTransmitter extends ExtendedBlockState return tiers; } - public static enum Size + public enum Size { SMALL(6), LARGE(8); public int centerSize; - private Size(int size) + Size(int size) { centerSize = size; } diff --git a/src/main/java/mekanism/common/chunkloading/IChunkLoader.java b/src/main/java/mekanism/common/chunkloading/IChunkLoader.java index bd6791cb8..ad8398456 100644 --- a/src/main/java/mekanism/common/chunkloading/IChunkLoader.java +++ b/src/main/java/mekanism/common/chunkloading/IChunkLoader.java @@ -7,7 +7,7 @@ import net.minecraft.util.math.ChunkPos; public interface IChunkLoader { - public TileComponentChunkLoader getChunkLoader(); + TileComponentChunkLoader getChunkLoader(); - public Set getChunkSet(); + Set getChunkSet(); } diff --git a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java index 38f519fec..a19c55113 100644 --- a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java @@ -154,7 +154,7 @@ public class ThreadMinerSearch extends Thread state = State.IDLE; } - public static enum State + public enum State { IDLE("Not ready"), SEARCHING("Searching"), @@ -163,7 +163,7 @@ public class ThreadMinerSearch extends Thread public String desc; - private State(String s) + State(String s) { desc = s; } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 478241a63..87a7370d5 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -345,7 +345,7 @@ public class TransporterStack return getPath().get(0); } - public static enum Path + public enum Path { DEST, HOME, NONE } diff --git a/src/main/java/mekanism/common/frequency/IFrequencyHandler.java b/src/main/java/mekanism/common/frequency/IFrequencyHandler.java index 4a760495c..80129b5b8 100644 --- a/src/main/java/mekanism/common/frequency/IFrequencyHandler.java +++ b/src/main/java/mekanism/common/frequency/IFrequencyHandler.java @@ -2,5 +2,5 @@ package mekanism.common.frequency; public interface IFrequencyHandler { - public Frequency getFrequency(FrequencyManager manager); + Frequency getFrequency(FrequencyManager manager); } diff --git a/src/main/java/mekanism/common/integration/computer/IComputerIntegration.java b/src/main/java/mekanism/common/integration/computer/IComputerIntegration.java index 82dff9342..2fa2f8bcd 100644 --- a/src/main/java/mekanism/common/integration/computer/IComputerIntegration.java +++ b/src/main/java/mekanism/common/integration/computer/IComputerIntegration.java @@ -7,7 +7,7 @@ import net.minecraft.inventory.IInventory; */ public interface IComputerIntegration extends IInventory { - public String[] getMethods(); + String[] getMethods(); - public Object[] invoke(int method, Object[] args) throws Exception; + Object[] invoke(int method, Object[] args) throws Exception; } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 965146bde..5afd872f6 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -284,7 +284,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool return getState(stack) == ConfiguratorMode.WRENCH; } - public static enum ConfiguratorMode + public enum ConfiguratorMode { CONFIGURATE_ITEMS("configurate", "(" + TransmissionType.ITEM.localize() + ")", EnumColor.BRIGHT_GREEN, true), CONFIGURATE_FLUIDS("configurate", "(" + TransmissionType.FLUID.localize() + ")", EnumColor.BRIGHT_GREEN, true), @@ -300,7 +300,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool private EnumColor color; private boolean configurating; - private ConfiguratorMode(String s, String s1, EnumColor c, boolean b) + ConfiguratorMode(String s, String s1, EnumColor c, boolean b) { name = s; info = s1; diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index 4bd4e07aa..1dd505bff 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -185,7 +185,7 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem ItemDataUtils.setInt(stack, "mode", mode.ordinal()); } - public static enum FlamethrowerMode + public enum FlamethrowerMode { COMBAT("tooltip.flamethrower.combat", EnumColor.YELLOW), HEAT("tooltip.flamethrower.heat", EnumColor.ORANGE), @@ -194,7 +194,7 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem private String unlocalized; private EnumColor color; - private FlamethrowerMode(String s, EnumColor c) + FlamethrowerMode(String s, EnumColor c) { unlocalized = s; color = c; diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index a5257f52b..23e4426e1 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -53,7 +53,7 @@ public class ItemHDPE extends ItemMekanism implements IMetaItem private String name; - private PlasticItem(String itemName) + PlasticItem(String itemName) { name = itemName; } diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index b5f6da241..b706372a1 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -225,7 +225,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor list.add(filled); } - public static enum JetpackMode + public enum JetpackMode { NORMAL("tooltip.jetpack.regular", EnumColor.DARK_GREEN), HOVER("tooltip.jetpack.hover", EnumColor.DARK_AQUA), @@ -234,7 +234,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor private String unlocalized; private EnumColor color; - private JetpackMode(String s, EnumColor c) + JetpackMode(String s, EnumColor c) { unlocalized = s; color = c; diff --git a/src/main/java/mekanism/common/multiblock/IMultiblock.java b/src/main/java/mekanism/common/multiblock/IMultiblock.java index 66821c0d5..1312981af 100644 --- a/src/main/java/mekanism/common/multiblock/IMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/IMultiblock.java @@ -6,9 +6,9 @@ import net.minecraft.util.EnumHand; public interface IMultiblock> { - public T getSynchronizedData(); + T getSynchronizedData(); - public boolean onActivate(EntityPlayer player, EnumHand hand, ItemStack stack); + boolean onActivate(EntityPlayer player, EnumHand hand, ItemStack stack); - public void doUpdate(); + void doUpdate(); } diff --git a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java index a25183869..817eb61b4 100644 --- a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java @@ -8,11 +8,11 @@ import net.minecraft.util.EnumHand; public interface IStructuralMultiblock { - public boolean onActivate(EntityPlayer player, EnumHand hand, ItemStack stack); + boolean onActivate(EntityPlayer player, EnumHand hand, ItemStack stack); - public boolean canInterface(TileEntity controller); + boolean canInterface(TileEntity controller); - public void setController(Coord4D coord); + void setController(Coord4D coord); - public void doUpdate(); + void doUpdate(); } diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 5b8b3ed66..52254501c 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -218,7 +218,7 @@ public class PacketConfigurationUpdate implements IMessageHandler } } - public static enum RobitPacketType + public enum RobitPacketType { GUI, FOLLOW, NAME, GO_HOME, - DROP_PICKUP; - } + DROP_PICKUP + } } diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index a229d971b..c76ccee5c 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -115,10 +115,10 @@ public class PacketScubaTankData implements IMessageHandler outputClass; private Class recipeClass; - private , OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> Recipe(String name, Class input, Class output, Class recipe) + , OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> Recipe(String name, Class input, Class output, Class recipe) { recipeName = name; diff --git a/src/main/java/mekanism/common/security/IOwnerItem.java b/src/main/java/mekanism/common/security/IOwnerItem.java index 95c4b5b33..23ae6a8d2 100644 --- a/src/main/java/mekanism/common/security/IOwnerItem.java +++ b/src/main/java/mekanism/common/security/IOwnerItem.java @@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack; public interface IOwnerItem { - public UUID getOwnerUUID(ItemStack stack); + UUID getOwnerUUID(ItemStack stack); - public void setOwnerUUID(ItemStack stack, UUID owner); + void setOwnerUUID(ItemStack stack, UUID owner); - public boolean hasOwner(ItemStack stack); + boolean hasOwner(ItemStack stack); } diff --git a/src/main/java/mekanism/common/security/ISecurityItem.java b/src/main/java/mekanism/common/security/ISecurityItem.java index d7bdde3d6..0131c4e42 100644 --- a/src/main/java/mekanism/common/security/ISecurityItem.java +++ b/src/main/java/mekanism/common/security/ISecurityItem.java @@ -5,9 +5,9 @@ import net.minecraft.item.ItemStack; public interface ISecurityItem extends IOwnerItem { - public SecurityMode getSecurity(ItemStack stack); + SecurityMode getSecurity(ItemStack stack); - public void setSecurity(ItemStack stack, SecurityMode mode); + void setSecurity(ItemStack stack, SecurityMode mode); - public boolean hasSecurity(ItemStack stack); + boolean hasSecurity(ItemStack stack); } diff --git a/src/main/java/mekanism/common/security/ISecurityTile.java b/src/main/java/mekanism/common/security/ISecurityTile.java index 3cbfb4e67..dc16b60ae 100644 --- a/src/main/java/mekanism/common/security/ISecurityTile.java +++ b/src/main/java/mekanism/common/security/ISecurityTile.java @@ -6,9 +6,9 @@ import mekanism.common.util.LangUtils; public interface ISecurityTile { - public TileComponentSecurity getSecurity(); + TileComponentSecurity getSecurity(); - public enum SecurityMode + enum SecurityMode { PUBLIC("security.public", EnumColor.BRIGHT_GREEN), PRIVATE("security.private", EnumColor.RED), @@ -22,7 +22,7 @@ public interface ISecurityTile return color + LangUtils.localize(display); } - private SecurityMode(String s, EnumColor c) + SecurityMode(String s, EnumColor c) { display = s; color = c; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 3040715d3..090d65a54 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -412,7 +412,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement return super.getCapability(capability, facing); } - public static enum RedstoneOutput + public enum RedstoneOutput { OFF("off"), ENTITY_DETECTION("entityDetection"), @@ -420,7 +420,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement private String unlocalizedName; - private RedstoneOutput(String name) + RedstoneOutput(String name) { unlocalizedName = name; } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index 8cf268e16..f72f4a99b 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -726,7 +726,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet return super.getCapability(capability, facing); } - public static enum ConnectionType implements IStringSerializable + public enum ConnectionType implements IStringSerializable { NORMAL, PUSH, diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index 7fa9616a0..a2135a673 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -222,7 +222,7 @@ public final class FluidContainerUtils return stack; } - public static enum ContainerEditMode + public enum ContainerEditMode { BOTH("fluidedit.both"), FILL("fluidedit.fill"), @@ -235,7 +235,7 @@ public final class FluidContainerUtils return LangUtils.localize(display); } - private ContainerEditMode(String s) + ContainerEditMode(String s) { display = s; } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index b624ceb57..c7571b65f 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1560,7 +1560,7 @@ public final class MekanismUtils return ret != null ? ret : ""; } - public static enum ResourceType + public enum ResourceType { GUI("gui"), GUI_ELEMENT("gui/elements"), @@ -1573,7 +1573,7 @@ public final class MekanismUtils private String prefix; - private ResourceType(String s) + ResourceType(String s) { prefix = s; } diff --git a/src/main/java/mekanism/common/util/UnitDisplayUtils.java b/src/main/java/mekanism/common/util/UnitDisplayUtils.java index 560d9e4eb..b44810743 100644 --- a/src/main/java/mekanism/common/util/UnitDisplayUtils.java +++ b/src/main/java/mekanism/common/util/UnitDisplayUtils.java @@ -5,7 +5,7 @@ package mekanism.common.util; */ public class UnitDisplayUtils { - public static enum ElectricUnit + public enum ElectricUnit { JOULES("Joule", "J"), REDSTONE_FLUX("Redstone Flux", "RF"), @@ -15,7 +15,7 @@ public class UnitDisplayUtils public String name; public String symbol; - private ElectricUnit(String s, String s1) + ElectricUnit(String s, String s1) { name = s; symbol = s1; @@ -27,7 +27,7 @@ public class UnitDisplayUtils } } - public static enum TemperatureUnit + public enum TemperatureUnit { KELVIN("Kelvin", "K", 0, 1), CELSIUS("Celsius", "°C", 273.15, 1), @@ -40,7 +40,7 @@ public class UnitDisplayUtils public double zeroOffset; public double intervalSize; - private TemperatureUnit(String s, String s1, double offset, double size) + TemperatureUnit(String s, String s1, double offset, double size) { name = s; symbol = s1; @@ -60,7 +60,7 @@ public class UnitDisplayUtils } /** Metric system of measurement. */ - public static enum MeasurementUnit + public enum MeasurementUnit { FEMTO("Femto", "f", 0.000000000000001D), PICO("Pico", "p", 0.000000000001D), @@ -86,7 +86,7 @@ public class UnitDisplayUtils /** Point by which a number is consider to be of this unit */ public double value; - private MeasurementUnit(String s, String s1, double v) + MeasurementUnit(String s, String s1, double v) { name = s; symbol = s1; @@ -281,7 +281,7 @@ public class UnitDisplayUtils return roundDecimals(d, 2); } - public static enum EnergyType + public enum EnergyType { J, RF, @@ -289,7 +289,7 @@ public class UnitDisplayUtils T } - public static enum TempType + public enum TempType { K, C, diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java index 9ce0e0c7a..96a691513 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java @@ -84,7 +84,7 @@ public class GuiTurbineTab extends GuiElement } } - public static enum TurbineTab + public enum TurbineTab { MAIN("GuiGasesTab.png", 6, "gui.main"), STAT("GuiStatsTab.png", 7, "gui.stats"); @@ -93,7 +93,7 @@ public class GuiTurbineTab extends GuiElement private int guiId; private String desc; - private TurbineTab(String s, int id, String s1) + TurbineTab(String s, int id, String s1) { path = s; guiId = id; @@ -115,4 +115,4 @@ public class GuiTurbineTab extends GuiElement return LangUtils.localize(desc); } } -} \ No newline at end of file +} 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 9b6710552..1415544ad 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -55,7 +55,7 @@ public class BlockStateGenerator extends ExtendedBlockState super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty}, new IUnlistedProperty[] {}); } - public static enum GeneratorBlock + public enum GeneratorBlock { GENERATOR_BLOCK_1; @@ -99,7 +99,7 @@ public class BlockStateGenerator extends ExtendedBlockState } } - public static enum GeneratorType implements IStringSerializable, IBlockType + public enum GeneratorType implements IStringSerializable, IBlockType { HEAT_GENERATOR(GeneratorBlock.GENERATOR_BLOCK_1, 0, "HeatGenerator", 0, 160000, TileEntityHeatGenerator.class, true, Plane.HORIZONTAL, false), SOLAR_GENERATOR(GeneratorBlock.GENERATOR_BLOCK_1, 1, "SolarGenerator", 1, 96000, TileEntitySolarGenerator.class, true, Plane.HORIZONTAL, false), @@ -125,7 +125,7 @@ public class BlockStateGenerator extends ExtendedBlockState public Predicate facingPredicate; public boolean activable; - private GeneratorType(GeneratorBlock block, int i, String s, int j, double k, Class tileClass, boolean model, Predicate predicate, boolean hasActiveTexture) + GeneratorType(GeneratorBlock block, int i, String s, int j, double k, Class tileClass, boolean model, Predicate predicate, boolean hasActiveTexture) { blockType = block; meta = i; 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 064a98d5d..0981b1d51 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java @@ -37,7 +37,7 @@ public class BlockStateReactor extends ExtendedBlockState super(block, new IProperty[] {typeProperty, activeProperty}, new IUnlistedProperty[] {}); } - public static enum ReactorBlock + public enum ReactorBlock { REACTOR_BLOCK, REACTOR_GLASS; @@ -84,7 +84,7 @@ public class BlockStateReactor extends ExtendedBlockState } } - public static enum ReactorBlockType implements IStringSerializable + public enum ReactorBlockType implements IStringSerializable { REACTOR_CONTROLLER(ReactorBlock.REACTOR_BLOCK, 0, "ReactorController", 10, TileEntityReactorController.class, true), REACTOR_FRAME(ReactorBlock.REACTOR_BLOCK, 1, "ReactorFrame", -1, TileEntityReactorFrame.class, false), @@ -100,7 +100,7 @@ public class BlockStateReactor extends ExtendedBlockState public Class tileEntityClass; public boolean activable; - private ReactorBlockType(ReactorBlock b, int i, String s, int j, Class tileClass, boolean activeState) + ReactorBlockType(ReactorBlock b, int i, String s, int j, Class tileClass, boolean activeState) { blockType = b; meta = i; 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 6d29bebaa..11bb06a2f 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -205,7 +205,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem } } - public static enum ReactorLogic + public enum ReactorLogic { DISABLED("disabled", new ItemStack(Items.GUNPOWDER)), READY("ready", new ItemStack(Items.REDSTONE)), @@ -215,7 +215,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem private String name; private ItemStack renderStack; - private ReactorLogic(String s, ItemStack stack) + ReactorLogic(String s, ItemStack stack) { name = s; renderStack = stack;