From 1922f34f1f8782f160e4808f4f6bb75a50703871 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Tue, 17 Mar 2020 19:12:19 +0100 Subject: Refactored Interfaces Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- .../tileentity/IBasicEnergyContainer.java | 34 +++--- .../interfaces/tileentity/IColoredTileEntity.java | 4 +- .../api/interfaces/tileentity/ICoverable.java | 26 ++--- .../api/interfaces/tileentity/IDigitalChest.java | 8 +- .../interfaces/tileentity/IEnergyConductor.java | 12 +- .../interfaces/tileentity/IEnergyConnected.java | 58 +++++----- .../tileentity/IExperimentalEnergyTileEntity.java | 8 +- .../api/interfaces/tileentity/IFibreConnected.java | 10 +- .../tileentity/IGearEnergyTileEntity.java | 4 +- .../tileentity/IGregTechDeviceInformation.java | 4 +- .../interfaces/tileentity/IGregTechTileEntity.java | 48 ++++---- .../api/interfaces/tileentity/IHasInventory.java | 8 +- .../tileentity/IHasWorldObjectAndCoords.java | 122 ++++++++++----------- .../tileentity/IMachineBlockUpdateable.java | 2 +- .../interfaces/tileentity/IMachineProgress.java | 24 ++-- .../tileentity/IPipeRenderedTileEntity.java | 6 +- .../interfaces/tileentity/IRedstoneReceiver.java | 8 +- .../interfaces/tileentity/IRedstoneTileEntity.java | 2 +- .../interfaces/tileentity/ITexturedTileEntity.java | 2 +- 19 files changed, 196 insertions(+), 194 deletions(-) (limited to 'src/main/java/gregtech/api/interfaces/tileentity') diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java index 423b3d4379..b795c793bc 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java @@ -9,83 +9,83 @@ public interface IBasicEnergyContainer extends IEnergyConnected { * It is used for checking the contained Energy before consuming it. * If this returns false, it will also give a Message inside the Scanner, that this Machine doesn't have enough Energy. */ - public boolean isUniversalEnergyStored(long aEnergyAmount); + boolean isUniversalEnergyStored(long aEnergyAmount); /** * Gets the stored electric, kinetic or steam Energy (with EU as reference Value) * Always returns the largest one. */ - public long getUniversalEnergyStored(); + long getUniversalEnergyStored(); /** * Gets the largest electric, kinetic or steam Energy Capacity (with EU as reference Value) */ - public long getUniversalEnergyCapacity(); + long getUniversalEnergyCapacity(); /** * Gets the amount of Energy Packets per tick. */ - public long getOutputAmperage(); + long getOutputAmperage(); /** * Gets the Output in EU/p. */ - public long getOutputVoltage(); + long getOutputVoltage(); /** * Gets the amount of Energy Packets per tick. */ - public long getInputAmperage(); + long getInputAmperage(); /** * Gets the maximum Input in EU/p. */ - public long getInputVoltage(); + long getInputVoltage(); /** * Decreases the Amount of stored universal Energy. If ignoring too less Energy, then it just sets the Energy to 0 and returns false. */ - public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy); + boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy); /** * Increases the Amount of stored electric Energy. If ignoring too much Energy, then the Energy Limit is just being ignored. */ - public boolean increaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooMuchEnergy); + boolean increaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooMuchEnergy); /** * Drain Energy Call for Electricity. */ - public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage); + boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage); /** * returns the amount of Electricity, accepted by this Block the last 5 ticks as Average. */ - public long getAverageElectricInput(); + long getAverageElectricInput(); /** * returns the amount of Electricity, outputted by this Block the last 5 ticks as Average. */ - public long getAverageElectricOutput(); + long getAverageElectricOutput(); /** * returns the amount of electricity contained in this Block, in EU units! */ - public long getStoredEU(); + long getStoredEU(); /** * returns the amount of electricity containable in this Block, in EU units! */ - public long getEUCapacity(); + long getEUCapacity(); /** * returns the amount of Steam contained in this Block, in EU units! */ - public long getStoredSteam(); + long getStoredSteam(); /** * returns the amount of Steam containable in this Block, in EU units! */ - public long getSteamCapacity(); + long getSteamCapacity(); /** * Increases stored Energy. Energy Base Value is in EU, even though it's Steam! @@ -96,5 +96,5 @@ public interface IBasicEnergyContainer extends IEnergyConnected { *

* And yes, you can't directly decrease the Steam of a Machine. That is done by decreaseStoredEnergyUnits */ - public boolean increaseStoredSteam(long aEnergy, boolean aIgnoreTooMuchEnergy); + boolean increaseStoredSteam(long aEnergy, boolean aIgnoreTooMuchEnergy); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java index 6b69911ad2..ddbb550dfc 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java @@ -4,12 +4,12 @@ public interface IColoredTileEntity { /** * @return 0 - 15 are Colors, while -1 means uncolored */ - public byte getColorization(); + byte getColorization(); /** * Sets the Color Modulation of the Block * * @param aColor the Color you want to set it to. -1 for reset. */ - public byte setColorization(byte aColor); + byte setColorization(byte aColor); } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java index 99ec88c149..912dc554c0 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java @@ -4,41 +4,41 @@ import gregtech.api.util.GT_CoverBehavior; import net.minecraft.item.ItemStack; public interface ICoverable extends IRedstoneTileEntity, IHasInventory, IBasicEnergyContainer { - public boolean canPlaceCoverIDAtSide(byte aSide, int aID); + boolean canPlaceCoverIDAtSide(byte aSide, int aID); - public boolean canPlaceCoverItemAtSide(byte aSide, ItemStack aCover); + boolean canPlaceCoverItemAtSide(byte aSide, ItemStack aCover); - public boolean dropCover(byte aSide, byte aDroppedSide, boolean aForced); + boolean dropCover(byte aSide, byte aDroppedSide, boolean aForced); - public void setCoverDataAtSide(byte aSide, int aData); + void setCoverDataAtSide(byte aSide, int aData); - public void setCoverIDAtSide(byte aSide, int aID); + void setCoverIDAtSide(byte aSide, int aID); - public void setCoverItemAtSide(byte aSide, ItemStack aCover); + void setCoverItemAtSide(byte aSide, ItemStack aCover); - public int getCoverDataAtSide(byte aSide); + int getCoverDataAtSide(byte aSide); - public int getCoverIDAtSide(byte aSide); + int getCoverIDAtSide(byte aSide); - public ItemStack getCoverItemAtSide(byte aSide); + ItemStack getCoverItemAtSide(byte aSide); - public GT_CoverBehavior getCoverBehaviorAtSide(byte aSide); + GT_CoverBehavior getCoverBehaviorAtSide(byte aSide); /** * For use by the regular MetaTileEntities. Returns the Cover Manipulated input Redstone. * Don't use this if you are a Cover Behavior. Only for MetaTileEntities. */ - public byte getInternalInputRedstoneSignal(byte aSide); + byte getInternalInputRedstoneSignal(byte aSide); /** * For use by the regular MetaTileEntities. This makes it not conflict with Cover based Redstone Signals. * Don't use this if you are a Cover Behavior. Only for MetaTileEntities. */ - public void setInternalOutputRedstoneSignal(byte aSide, byte aStrength); + void setInternalOutputRedstoneSignal(byte aSide, byte aStrength); /** * Causes a general Cover Texture update. * Sends 6 Integers to Client + causes @issueTextureUpdate() */ - public void issueCoverUpdate(byte aSide); + void issueCoverUpdate(byte aSide); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IDigitalChest.java b/src/main/java/gregtech/api/interfaces/tileentity/IDigitalChest.java index 8f55b75fcf..d7c39c900c 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IDigitalChest.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IDigitalChest.java @@ -11,21 +11,21 @@ public interface IDigitalChest extends IHasWorldObjectAndCoords { * I need things like this Function for MetaTileEntities, you MUST check this!!! * Do not assume that it's a Digital Chest or similar Device, when it just implements this Interface. */ - public boolean isDigitalChest(); + boolean isDigitalChest(); /** * Gives an Array of Stacks with Size (of all the Data-stored Items) of the correspondent Item kinds (regular QChests have only one) * Does NOT include the 64 "ready" Items inside the Slots, and neither the 128 Items in the overflow Buffer. */ - public ItemStack[] getStoredItemData(); + ItemStack[] getStoredItemData(); /** * A generic Interface for just setting the amount of contained Items */ - public void setItemCount(int aCount); + void setItemCount(int aCount); /** * Gets the maximum Item count for this QChest alike Storage. This applies to the Data-Storage, not for the up to 192 buffered Items! */ - public int getMaxItemCount(); + int getMaxItemCount(); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConductor.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConductor.java index 2384678529..32fd276600 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConductor.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConductor.java @@ -11,30 +11,30 @@ public interface IEnergyConductor extends IEnergyConnected { /** * @return if this is actually a Cable. (you must check this) */ - public boolean isConductor(); + boolean isConductor(); /** * @return the maximum Voltage of the Cable. */ - public long getMaxVoltage(); + long getMaxVoltage(); /** * @return the maximum Amperage of the Cable, per Wire. */ - public long getMaxAmperage(); + long getMaxAmperage(); /** * @return the Loss of the Cable, per Meter. */ - public long getLossPerMeter(); + long getLossPerMeter(); /** * @return the Material the Cable consists of. (may return Materials._NULL) */ - public Materials getCableMaterial(); + Materials getCableMaterial(); /** * @return the Material the Cable Insulation consists of. (may return Materials._NULL) */ - public Materials getInsulationMaterial(); + Materials getInsulationMaterial(); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java index 73436e3b2a..47bec844ee 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java @@ -29,28 +29,30 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd * @param aSide 0 - 5 = Vanilla Directions of YOUR Block the Energy gets inserted to. 6 = No specific Side (don't do Side checks for this Side) * @return amount of used Amperes. 0 if not accepted anything. */ - public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage); + long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage); /** * Sided Energy Input */ - public boolean inputEnergyFrom(byte aSide); - default public boolean inputEnergyFrom(byte aSide, boolean waitForActive) { + boolean inputEnergyFrom(byte aSide); + + default boolean inputEnergyFrom(byte aSide, boolean waitForActive) { return inputEnergyFrom(aSide); } /** * Sided Energy Output */ - public boolean outputsEnergyTo(byte aSide); - default public boolean outputsEnergyTo(byte aSide, boolean waitForActive) { + boolean outputsEnergyTo(byte aSide); + + default boolean outputsEnergyTo(byte aSide, boolean waitForActive) { return outputsEnergyTo(aSide); } /** * Utility for the Network */ - public static class Util { + class Util { /** * Emits Energy to the E-net. Also compatible with adjacent IC2 TileEntities. * @@ -84,33 +86,33 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd if (rfOut > 32L * GregTech_API.mEUtoRF / 100L) { int aExplosionPower = rfOut; float tStrength = - aExplosionPower < V[0] ? 1.0F : - aExplosionPower < V[1] ? 2.0F : - aExplosionPower < V[2] ? 3.0F : - aExplosionPower < V[3] ? 4.0F : - aExplosionPower < V[4] ? 5.0F : - aExplosionPower < V[4] * 2 ? 6.0F : - aExplosionPower < V[5] ? 7.0F : - aExplosionPower < V[6] ? 8.0F : - aExplosionPower < V[7] ? 9.0F : - aExplosionPower < V[8] ? 10.0F : - aExplosionPower < V[8] * 2 ? 11.0F : - aExplosionPower < V[9] ? 12.0F : - aExplosionPower < V[10] ? 13.0F : - aExplosionPower < V[11] ? 14.0F : - aExplosionPower < V[12] ? 15.0F : - aExplosionPower < V[12] * 2 ? 16.0F : - aExplosionPower < V[13] ? 17.0F : - aExplosionPower < V[14] ? 18.0F : - aExplosionPower < V[15] ? 19.0F : 20.0F; + aExplosionPower < V[0] ? 1.0F : + aExplosionPower < V[1] ? 2.0F : + aExplosionPower < V[2] ? 3.0F : + aExplosionPower < V[3] ? 4.0F : + aExplosionPower < V[4] ? 5.0F : + aExplosionPower < V[4] * 2 ? 6.0F : + aExplosionPower < V[5] ? 7.0F : + aExplosionPower < V[6] ? 8.0F : + aExplosionPower < V[7] ? 9.0F : + aExplosionPower < V[8] ? 10.0F : + aExplosionPower < V[8] * 2 ? 11.0F : + aExplosionPower < V[9] ? 12.0F : + aExplosionPower < V[10] ? 13.0F : + aExplosionPower < V[11] ? 14.0F : + aExplosionPower < V[12] ? 15.0F : + aExplosionPower < V[12] * 2 ? 16.0F : + aExplosionPower < V[13] ? 17.0F : + aExplosionPower < V[14] ? 18.0F : + aExplosionPower < V[15] ? 19.0F : 20.0F; int tX = tTileEntity.xCoord, tY = tTileEntity.yCoord, tZ = tTileEntity.zCoord; World tWorld = tTileEntity.getWorldObj(); GT_Utility.sendSoundToPlayers(tWorld, GregTech_API.sSoundList.get(209), 1.0F, -1, tX, tY, tZ); tWorld.setBlock(tX, tY, tZ, Blocks.air); if (GregTech_API.sMachineExplosions) - if(GT_Mod.gregtechproxy.mPollution) - GT_Pollution.addPollution(tWorld.getChunkFromBlockCoords(tX,tZ), 100000); - tWorld.createExplosion(null, tX + 0.5, tY + 0.5, tZ + 0.5, tStrength, true); + if (GT_Mod.gregtechproxy.mPollution) + GT_Pollution.addPollution(tWorld.getChunkFromBlockCoords(tX, tZ), 100000); + tWorld.createExplosion(null, tX + 0.5, tY + 0.5, tZ + 0.5, tStrength, true); } } } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java index 7e86701f6b..3a32a557fb 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java @@ -25,22 +25,22 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW * @param aSide 0 - 5 = Vanilla Directions of YOUR Block the Energy gets inserted to. 6 = No specific Side (don't do Side checks for this Side) * @return amount of used Amperes. 0 if not accepted anything. */ - public long injectEnergy(SubTag aEnergyType, byte aSide, long aPrimary, long aSecondary); + long injectEnergy(SubTag aEnergyType, byte aSide, long aPrimary, long aSecondary); /** * Sided Energy Input */ - public boolean inputEnergyFrom(SubTag aEnergyType, byte aSide); + boolean inputEnergyFrom(SubTag aEnergyType, byte aSide); /** * Sided Energy Output */ - public boolean outputsEnergyTo(SubTag aEnergyType, byte aSide); + boolean outputsEnergyTo(SubTag aEnergyType, byte aSide); /** * Utility for the Network */ - public static class Util { + class Util { public static int RF_PER_EU = 4; private static boolean RF_ENERGY = false, IC_ENERGY = false, CHECK_ALL = true; diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IFibreConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IFibreConnected.java index edcf5bdb89..bde86524c5 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IFibreConnected.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IFibreConnected.java @@ -7,25 +7,25 @@ public interface IFibreConnected extends IColoredTileEntity, IHasWorldObjectAndC /** * If this Blocks accepts Fibre from this Side */ - public void inputFibreFrom(byte aSide); + void inputFibreFrom(byte aSide); /** * If this Blocks emits Fibre to this Side */ - public void outputsFibreTo(byte aSide); + void outputsFibreTo(byte aSide); /** * Sets the Signal this Blocks outputs to this Fibre Color */ - public void setFibreOutput(byte aSide, byte aColor, byte aRedstoneStrength); + void setFibreOutput(byte aSide, byte aColor, byte aRedstoneStrength); /** * Gets the Signal this Blocks outputs to this Fibre Color */ - public byte getFibreOutput(byte aSide, byte aColor); + byte getFibreOutput(byte aSide, byte aColor); /** * Gets the Signal this Blocks receives from this Fibre Color */ - public byte getFibreInput(byte aSide, byte aColor); + byte getFibreInput(byte aSide, byte aColor); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGearEnergyTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGearEnergyTileEntity.java index 796f0a11b3..54fe151cb1 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IGearEnergyTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IGearEnergyTileEntity.java @@ -5,7 +5,7 @@ public interface IGearEnergyTileEntity { * If Rotation Energy can be accepted on this Side. * This means that the Gear/Axle will connect to this Side, and can cause the Gear/Axle to stop if the Energy isn't accepted. */ - public boolean acceptsRotationalEnergy(byte aSide); + boolean acceptsRotationalEnergy(byte aSide); /** * Inject Energy Call for Rotational Energy. @@ -13,5 +13,5 @@ public interface IGearEnergyTileEntity { * * @param aSpeed Positive = Clockwise, Negative = Counterclockwise */ - public boolean injectRotationalEnergy(byte aSide, long aSpeed, long aEnergy); + boolean injectRotationalEnergy(byte aSide, long aSpeed, long aEnergy); } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechDeviceInformation.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechDeviceInformation.java index e4bb4f1371..39c779e69c 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechDeviceInformation.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechDeviceInformation.java @@ -9,7 +9,7 @@ public interface IGregTechDeviceInformation { * I need things like this Function for MetaTileEntities, you MUST check this!!! * Do not assume that it's a Information returning Device, when it just implements this Interface. */ - public boolean isGivingInformation(); + boolean isGivingInformation(); /** * Up to 8 Strings can be returned. @@ -17,5 +17,5 @@ public interface IGregTechDeviceInformation { * * @return an Array of Information Strings. Don't return null! */ - public String[] getInfoData(); + String[] getInfoData(); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java index 8bd8c5b678..af9ead9543 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java @@ -25,27 +25,27 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil /** * gets the Error displayed on the GUI */ - public int getErrorDisplayID(); + int getErrorDisplayID(); /** * sets the Error displayed on the GUI */ - public void setErrorDisplayID(int aErrorID); + void setErrorDisplayID(int aErrorID); /** * @return the MetaID of the Block or the MetaTileEntity ID. */ - public int getMetaTileID(); + int getMetaTileID(); /** * Internal Usage only! */ - public int setMetaTileID(short aID); + int setMetaTileID(short aID); /** * @return the MetaTileEntity which is belonging to this, or null if it doesnt has one. */ - public IMetaTileEntity getMetaTileEntity(); + IMetaTileEntity getMetaTileEntity(); /** * Sets the MetaTileEntity. @@ -54,54 +54,54 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil * * @param aMetaTileEntity */ - public void setMetaTileEntity(IMetaTileEntity aMetaTileEntity); + void setMetaTileEntity(IMetaTileEntity aMetaTileEntity); /** * Causes a general Texture update. *

* Only used Client Side to mark Blocks dirty. */ - public void issueTextureUpdate(); + void issueTextureUpdate(); /** * Causes the Machine to send its initial Data, like Covers and its ID. */ - public void issueClientUpdate(); + void issueClientUpdate(); /** * causes Explosion. Strength in Overload-EU */ - public void doExplosion(long aExplosionEU); + void doExplosion(long aExplosionEU); /** * Sets the Block on Fire in all 6 Directions */ - public void setOnFire(); + void setOnFire(); /** * Sets the Block to Fire */ - public void setToFire(); + void setToFire(); /** * Sets the Owner of the Machine. Returns the set Name. */ - public String setOwnerName(String aName); + String setOwnerName(String aName); /** * gets the Name of the Machines Owner or "Player" if not set. */ - public String getOwnerName(); + String getOwnerName(); /** * Gets the UniqueID of the Machines Owner. */ - public UUID getOwnerUuid(); + UUID getOwnerUuid(); /** * Sets the UniqueID of the Machines Owner. */ - public void setOwnerUuid(UUID uuid); + void setOwnerUuid(UUID uuid); /** * Sets initial Values from NBT @@ -109,30 +109,30 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil * @param aNBT is the NBTTag of readFromNBT * @param aID is the MetaTileEntityID */ - public void setInitialValuesAsNBT(NBTTagCompound aNBT, short aID); + void setInitialValuesAsNBT(NBTTagCompound aNBT, short aID); /** * Called when leftclicking the TileEntity */ - public void onLeftclick(EntityPlayer aPlayer); + void onLeftclick(EntityPlayer aPlayer); /** * Called when rightclicking the TileEntity */ - public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float par1, float par2, float par3); + boolean onRightclick(EntityPlayer aPlayer, byte aSide, float par1, float par2, float par3); - public float getBlastResistance(byte aSide); + float getBlastResistance(byte aSide); - public ArrayList getDrops(); + ArrayList getDrops(); /** * 255 = 100% */ - public int getLightOpacity(); + int getLightOpacity(); - public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List outputAABB, Entity collider); + void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List outputAABB, Entity collider); - public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ); + AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ); - public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider); + void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IHasInventory.java b/src/main/java/gregtech/api/interfaces/tileentity/IHasInventory.java index 3bd8b0429c..42df520ff4 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IHasInventory.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IHasInventory.java @@ -8,12 +8,12 @@ public interface IHasInventory extends ISidedInventory, IHasWorldObjectAndCoords /** * if the Inventory of this TileEntity got modified this tick */ - public boolean hasInventoryBeenModified(); + boolean hasInventoryBeenModified(); /** * if this is just a Holoslot */ - public boolean isValidSlot(int aIndex); + boolean isValidSlot(int aIndex); /** * Tries to add a Stack to the Slot. @@ -21,7 +21,7 @@ public interface IHasInventory extends ISidedInventory, IHasWorldObjectAndCoords * * @return true if aStack == null, then false if aIndex is out of bounds, then false if aStack cannot be added, and then true if aStack has been added */ - public boolean addStackToSlot(int aIndex, ItemStack aStack); + boolean addStackToSlot(int aIndex, ItemStack aStack); /** * Tries to add X Items of a Stack to the Slot. @@ -29,5 +29,5 @@ public interface IHasInventory extends ISidedInventory, IHasWorldObjectAndCoords * * @return true if aStack == null, then false if aIndex is out of bounds, then false if aStack cannot be added, and then true if aStack has been added */ - public boolean addStackToSlot(int aIndex, ItemStack aStack, int aAmount); + boolean addStackToSlot(int aIndex, ItemStack aStack, int aAmount); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java b/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java index c86ac0f33f..9b7489cf00 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java @@ -17,153 +17,153 @@ import net.minecraftforge.fluids.IFluidHandler; * Note: It doesn't have to be a TileEntity in certain cases! And only certain cases, such as the Recipe checking of the findRecipe Function. */ public interface IHasWorldObjectAndCoords { - public World getWorld(); + World getWorld(); - public int getXCoord(); + int getXCoord(); - public short getYCoord(); + short getYCoord(); - public int getZCoord(); + int getZCoord(); - public boolean isServerSide(); + boolean isServerSide(); - public boolean isClientSide(); + boolean isClientSide(); - public int getRandomNumber(int aRange); + int getRandomNumber(int aRange); - public TileEntity getTileEntity(int aX, int aY, int aZ); + TileEntity getTileEntity(int aX, int aY, int aZ); - public TileEntity getTileEntityOffset(int aX, int aY, int aZ); + TileEntity getTileEntityOffset(int aX, int aY, int aZ); - public TileEntity getTileEntityAtSide(byte aSide); + TileEntity getTileEntityAtSide(byte aSide); - public TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance); + TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance); - public IInventory getIInventory(int aX, int aY, int aZ); + IInventory getIInventory(int aX, int aY, int aZ); - public IInventory getIInventoryOffset(int aX, int aY, int aZ); + IInventory getIInventoryOffset(int aX, int aY, int aZ); - public IInventory getIInventoryAtSide(byte aSide); + IInventory getIInventoryAtSide(byte aSide); - public IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance); + IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance); - public IFluidHandler getITankContainer(int aX, int aY, int aZ); + IFluidHandler getITankContainer(int aX, int aY, int aZ); - public IFluidHandler getITankContainerOffset(int aX, int aY, int aZ); + IFluidHandler getITankContainerOffset(int aX, int aY, int aZ); - public IFluidHandler getITankContainerAtSide(byte aSide); + IFluidHandler getITankContainerAtSide(byte aSide); - public IFluidHandler getITankContainerAtSideAndDistance(byte aSide, int aDistance); + IFluidHandler getITankContainerAtSideAndDistance(byte aSide, int aDistance); - public IGregTechTileEntity getIGregTechTileEntity(int aX, int aY, int aZ); + IGregTechTileEntity getIGregTechTileEntity(int aX, int aY, int aZ); - public IGregTechTileEntity getIGregTechTileEntityOffset(int aX, int aY, int aZ); + IGregTechTileEntity getIGregTechTileEntityOffset(int aX, int aY, int aZ); - public IGregTechTileEntity getIGregTechTileEntityAtSide(byte aSide); + IGregTechTileEntity getIGregTechTileEntityAtSide(byte aSide); - public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte aSide, int aDistance); + IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte aSide, int aDistance); - public Block getBlock(int aX, int aY, int aZ); + Block getBlock(int aX, int aY, int aZ); - public Block getBlockOffset(int aX, int aY, int aZ); + Block getBlockOffset(int aX, int aY, int aZ); - public Block getBlockAtSide(byte aSide); + Block getBlockAtSide(byte aSide); - public Block getBlockAtSideAndDistance(byte aSide, int aDistance); + Block getBlockAtSideAndDistance(byte aSide, int aDistance); - public byte getMetaID(int aX, int aY, int aZ); + byte getMetaID(int aX, int aY, int aZ); - public byte getMetaIDOffset(int aX, int aY, int aZ); + byte getMetaIDOffset(int aX, int aY, int aZ); - public byte getMetaIDAtSide(byte aSide); + byte getMetaIDAtSide(byte aSide); - public byte getMetaIDAtSideAndDistance(byte aSide, int aDistance); + byte getMetaIDAtSideAndDistance(byte aSide, int aDistance); - public byte getLightLevel(int aX, int aY, int aZ); + byte getLightLevel(int aX, int aY, int aZ); - public byte getLightLevelOffset(int aX, int aY, int aZ); + byte getLightLevelOffset(int aX, int aY, int aZ); - public byte getLightLevelAtSide(byte aSide); + byte getLightLevelAtSide(byte aSide); - public byte getLightLevelAtSideAndDistance(byte aSide, int aDistance); + byte getLightLevelAtSideAndDistance(byte aSide, int aDistance); - public boolean getOpacity(int aX, int aY, int aZ); + boolean getOpacity(int aX, int aY, int aZ); - public boolean getOpacityOffset(int aX, int aY, int aZ); + boolean getOpacityOffset(int aX, int aY, int aZ); - public boolean getOpacityAtSide(byte aSide); + boolean getOpacityAtSide(byte aSide); - public boolean getOpacityAtSideAndDistance(byte aSide, int aDistance); + boolean getOpacityAtSideAndDistance(byte aSide, int aDistance); - public boolean getSky(int aX, int aY, int aZ); + boolean getSky(int aX, int aY, int aZ); - public boolean getSkyOffset(int aX, int aY, int aZ); + boolean getSkyOffset(int aX, int aY, int aZ); - public boolean getSkyAtSide(byte aSide); + boolean getSkyAtSide(byte aSide); - public boolean getSkyAtSideAndDistance(byte aSide, int aDistance); + boolean getSkyAtSideAndDistance(byte aSide, int aDistance); - public boolean getAir(int aX, int aY, int aZ); + boolean getAir(int aX, int aY, int aZ); - public boolean getAirOffset(int aX, int aY, int aZ); + boolean getAirOffset(int aX, int aY, int aZ); - public boolean getAirAtSide(byte aSide); + boolean getAirAtSide(byte aSide); - public boolean getAirAtSideAndDistance(byte aSide, int aDistance); + boolean getAirAtSideAndDistance(byte aSide, int aDistance); - public BiomeGenBase getBiome(); + BiomeGenBase getBiome(); - public BiomeGenBase getBiome(int aX, int aZ); + BiomeGenBase getBiome(int aX, int aZ); - public int getOffsetX(byte aSide, int aMultiplier); + int getOffsetX(byte aSide, int aMultiplier); - public short getOffsetY(byte aSide, int aMultiplier); + short getOffsetY(byte aSide, int aMultiplier); - public int getOffsetZ(byte aSide, int aMultiplier); + int getOffsetZ(byte aSide, int aMultiplier); /** * Checks if the TileEntity is Invalid or Unloaded. Stupid Minecraft cannot do that btw. */ - public boolean isDead(); + boolean isDead(); /** * Sends a Block Event to the Client TileEntity, the byte Parameters are only for validation as Minecraft doesn't properly write Packet Data. */ - public void sendBlockEvent(byte aID, byte aValue); + void sendBlockEvent(byte aID, byte aValue); /** * @return the Time this TileEntity has been loaded. */ - public long getTimer(); + long getTimer(); /** * Sets the Light Level of this Block on a Scale of 0 - 15 * It could be that it doesn't work. This is just for convenience. */ - public void setLightValue(byte aLightValue); + void setLightValue(byte aLightValue); /** * Function of the regular TileEntity */ - public void writeToNBT(NBTTagCompound aNBT); + void writeToNBT(NBTTagCompound aNBT); /** * Function of the regular TileEntity */ - public void readFromNBT(NBTTagCompound aNBT); + void readFromNBT(NBTTagCompound aNBT); /** * Function of the regular TileEntity */ - public boolean isInvalidTileEntity(); + boolean isInvalidTileEntity(); /** * Opens the GUI with this ID of this MetaTileEntity */ - public boolean openGUI(EntityPlayer aPlayer, int aID); + boolean openGUI(EntityPlayer aPlayer, int aID); /** * Opens the GUI with the ID = 0 of this TileEntity */ - public boolean openGUI(EntityPlayer aPlayer); + boolean openGUI(EntityPlayer aPlayer); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java b/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java index bb34419357..c7f6fe5f23 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java @@ -12,5 +12,5 @@ public interface IMachineBlockUpdateable { * I suggest to wait 1-5 seconds before actually checking the Machine Parts. * RP-Frames could for example cause Problems when you instacheck the Machine Parts. */ - public void onMachineBlockUpdate(); + void onMachineBlockUpdate(); } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java b/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java index 00bb7b9a7d..588158d16c 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java @@ -7,63 +7,63 @@ public interface IMachineProgress extends IHasWorldObjectAndCoords { /** * returns the Progress this Machine has made. Warning, this can also be negative! */ - public int getProgress(); + int getProgress(); /** * returns the Progress the Machine needs to complete its task. */ - public int getMaxProgress(); + int getMaxProgress(); /** * increases the Progress of the Machine */ - public boolean increaseProgress(int aProgressAmountInTicks); + boolean increaseProgress(int aProgressAmountInTicks); /** * returns if the Machine currently does something. */ - public boolean hasThingsToDo(); + boolean hasThingsToDo(); /** * returns if the Machine just got enableWorking called after being disabled. * Used for Translocators, which need to check if they need to transfer immediately. */ - public boolean hasWorkJustBeenEnabled(); + boolean hasWorkJustBeenEnabled(); /** * allows Machine to work */ - public void enableWorking(); + void enableWorking(); /** * disallows Machine to work */ - public void disableWorking(); + void disableWorking(); /** * if the Machine is allowed to Work */ - public boolean isAllowedToWork(); + boolean isAllowedToWork(); /** * used to control Machines via Redstone Signal Strength by special Covers * In case of 0 the Machine is very likely doing nothing, or is just not being controlled at all. */ - public byte getWorkDataValue(); + byte getWorkDataValue(); /** * used to control Machines via Redstone Signal Strength by special Covers * only Values between 0 and 15! */ - public void setWorkDataValue(byte aValue); + void setWorkDataValue(byte aValue); /** * gives you the Active Status of the Machine */ - public boolean isActive(); + boolean isActive(); /** * sets the visible Active Status of the Machine */ - public void setActive(boolean aActive); + void setActive(boolean aActive); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java index 6618e4b4fd..909f4077f0 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java @@ -3,9 +3,9 @@ package gregtech.api.interfaces.tileentity; import gregtech.api.interfaces.ITexture; public interface IPipeRenderedTileEntity extends ICoverable, ITexturedTileEntity { - public float getThickNess(); + float getThickNess(); - public byte getConnections(); + byte getConnections(); - public ITexture[] getTextureUncovered(byte aSide); + ITexture[] getTextureUncovered(byte aSide); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IRedstoneReceiver.java b/src/main/java/gregtech/api/interfaces/tileentity/IRedstoneReceiver.java index f5b0f76bad..8c644be2e6 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IRedstoneReceiver.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IRedstoneReceiver.java @@ -10,20 +10,20 @@ public interface IRedstoneReceiver extends IHasWorldObjectAndCoords { * Do not use this if ICoverable is implemented. ICoverable has @getInternalInputRedstoneSignal for Machine internal Input Redstone * This returns the true incoming Redstone Signal. Only Cover Behaviors should check it, not MetaTileEntities. */ - public byte getInputRedstoneSignal(byte aSide); + byte getInputRedstoneSignal(byte aSide); /** * gets the strongest Redstone Level the TileEntity receives */ - public byte getStrongestRedstone(); + byte getStrongestRedstone(); /** * gets if the TileEntity receives Redstone */ - public boolean getRedstone(); + boolean getRedstone(); /** * gets if the TileEntity receives Redstone at this Side */ - public boolean getRedstone(byte aSide); + boolean getRedstone(byte aSide); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IRedstoneTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IRedstoneTileEntity.java index f1cf01d291..6100572a7d 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IRedstoneTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IRedstoneTileEntity.java @@ -13,5 +13,5 @@ public interface IRedstoneTileEntity extends IRedstoneEmitter, IRedstoneReceiver * Causes a general Block update. * Sends nothing to Client, just causes a Block Update. */ - public void issueBlockUpdate(); + void issueBlockUpdate(); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java index 048ddbdd06..b16ae65548 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java @@ -7,5 +7,5 @@ public interface ITexturedTileEntity { /** * @return the Textures rendered by the GT Rendering */ - public ITexture[] getTexture(Block aBlock, byte aSide); + ITexture[] getTexture(Block aBlock, byte aSide); } \ No newline at end of file -- cgit