diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/api/interfaces')
13 files changed, 329 insertions, 346 deletions
diff --git a/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java b/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java index c04e25f570..ad65c03429 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java @@ -1,33 +1,31 @@ package gtPlusPlus.api.interfaces; import java.util.Set; - import net.minecraft.world.ChunkCoordIntPair; public interface IChunkLoader { - public long getTicksRemaining(); - - public void setTicksRemaining(long aTicks); - - public ChunkCoordIntPair getResidingChunk(); - - public void setResidingChunk(ChunkCoordIntPair aCurrentChunk); - - public boolean getChunkLoadingActive(); - - public void setChunkLoadingActive(boolean aActive); - - public boolean getDoesWorkChunkNeedReload(); - - public void setDoesWorkChunkNeedReload(boolean aActive); - - public boolean addChunkToLoadedList(ChunkCoordIntPair aActiveChunk); - - public boolean removeChunkFromLoadedList(ChunkCoordIntPair aActiveChunk); - - public Set<ChunkCoordIntPair> getManagedChunks(); - - public int getChunkloaderTier(); - + public long getTicksRemaining(); + + public void setTicksRemaining(long aTicks); + + public ChunkCoordIntPair getResidingChunk(); + + public void setResidingChunk(ChunkCoordIntPair aCurrentChunk); + + public boolean getChunkLoadingActive(); + + public void setChunkLoadingActive(boolean aActive); + + public boolean getDoesWorkChunkNeedReload(); + + public void setDoesWorkChunkNeedReload(boolean aActive); + + public boolean addChunkToLoadedList(ChunkCoordIntPair aActiveChunk); + + public boolean removeChunkFromLoadedList(ChunkCoordIntPair aActiveChunk); + + public Set<ChunkCoordIntPair> getManagedChunks(); + + public int getChunkloaderTier(); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java b/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java index ddbf9f38bb..830b34a41d 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java @@ -1,8 +1,5 @@ package gtPlusPlus.api.interfaces; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GTPP_Recipe; -public interface IComparableRecipe extends Comparable<GT_Recipe>{ - -} +public interface IComparableRecipe extends Comparable<GT_Recipe> {} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java b/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java index 5ab90d47ce..9e3ea89606 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java @@ -1,21 +1,19 @@ package gtPlusPlus.api.interfaces; +import gtPlusPlus.api.objects.minecraft.BlockPos; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import gtPlusPlus.api.objects.minecraft.BlockPos; - public interface IEntityCatcher { - public boolean hasEntity(ItemStack aStack); - - public Entity getStoredEntity(World aWorld, ItemStack aStack); - - public boolean setStoredEntity(World aWorld, ItemStack aStack, Entity aEntity); - - public Class<? extends Entity> getStoredEntityClass(ItemStack aStack); - - public boolean spawnStoredEntity(World aWorld, ItemStack aStack, BlockPos aPos); - + public boolean hasEntity(ItemStack aStack); + + public Entity getStoredEntity(World aWorld, ItemStack aStack); + + public boolean setStoredEntity(World aWorld, ItemStack aStack, Entity aEntity); + + public Class<? extends Entity> getStoredEntityClass(ItemStack aStack); + + public boolean spawnStoredEntity(World aWorld, ItemStack aStack, BlockPos aPos); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java b/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java index 63f2adbba7..251eaa416c 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java @@ -3,15 +3,14 @@ package gtPlusPlus.api.interfaces; import java.util.Random; import net.minecraft.world.World; -public abstract interface IGeneratorWorld -{ - public abstract boolean generate(World paramWorld, Random paramRandom, int paramInt1, int paramInt2); - - public abstract void initiate(); - - public abstract int getExtentX(); - - public abstract int getExtentZ(); - - public abstract int getRange(); +public abstract interface IGeneratorWorld { + public abstract boolean generate(World paramWorld, Random paramRandom, int paramInt1, int paramInt2); + + public abstract void initiate(); + + public abstract int getExtentX(); + + public abstract int getExtentZ(); + + public abstract int getRange(); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java index fa59c58d9f..4a41e47a7b 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java @@ -6,8 +6,7 @@ import java.io.IOException; public interface IGregtechPacketEntity { - public void writePacketData(DataOutputStream data) throws IOException; + public void writePacketData(DataOutputStream data) throws IOException; - public void readPacketData(DataInputStream data) throws IOException; - + public void readPacketData(DataInputStream data) throws IOException; } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java index 4bb29b3354..b4223fb558 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java @@ -1,145 +1,143 @@ package gtPlusPlus.api.interfaces; +import gregtech.api.interfaces.IDescribable; +import gregtech.api.interfaces.tileentity.*; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import gregtech.api.interfaces.IDescribable; -import gregtech.api.interfaces.tileentity.*; +public abstract interface IGregtechPower + extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer { -public abstract interface IGregtechPower extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer { + @Override + public String[] getDescription(); - @Override - public String[] getDescription(); + @Override + default boolean isUniversalEnergyStored(long p0) { + return false; + } - @Override - default boolean isUniversalEnergyStored(long p0) { - return false; - } + @Override + public long getOutputAmperage(); - @Override - public long getOutputAmperage(); + @Override + public long getOutputVoltage(); - @Override - public long getOutputVoltage(); + @Override + public long getInputAmperage(); - @Override - public long getInputAmperage(); + @Override + public long getInputVoltage(); - @Override - public long getInputVoltage(); + @Override + public boolean decreaseStoredEnergyUnits(long p0, boolean p1); - @Override - public boolean decreaseStoredEnergyUnits(long p0, boolean p1); + @Override + public boolean increaseStoredEnergyUnits(long p0, boolean p1); - @Override - public boolean increaseStoredEnergyUnits(long p0, boolean p1); + @Override + public boolean drainEnergyUnits(byte p0, long p1, long p2); - @Override - public boolean drainEnergyUnits(byte p0, long p1, long p2); + @Override + public long getAverageElectricInput(); - @Override - public long getAverageElectricInput(); + @Override + public long getAverageElectricOutput(); - @Override - public long getAverageElectricOutput(); + @Override + public long getStoredEU(); - @Override - public long getStoredEU(); + @Override + public long getEUCapacity(); - @Override - public long getEUCapacity(); + @Override + public long getStoredSteam(); - @Override - public long getStoredSteam(); + @Override + public long getSteamCapacity(); - @Override - public long getSteamCapacity(); + @Override + public boolean increaseStoredSteam(long p0, boolean p1); - @Override - public boolean increaseStoredSteam(long p0, boolean p1); + @Override + public Block getBlockAtSide(byte p0); - @Override - public Block getBlockAtSide(byte p0); + @Override + public Block getBlockAtSideAndDistance(byte p0, int p1); - @Override - public Block getBlockAtSideAndDistance(byte p0, int p1); + @Override + public Block getBlockOffset(int p0, int p1, int p2); - @Override - public Block getBlockOffset(int p0, int p1, int p2); + @Override + public TileEntity getTileEntity(int p0, int p1, int p2); - - @Override - public TileEntity getTileEntity(int p0, int p1, int p2); + @Override + public TileEntity getTileEntityAtSide(byte p0); - @Override - public TileEntity getTileEntityAtSide(byte p0); + @Override + public TileEntity getTileEntityAtSideAndDistance(byte p0, int p1); - @Override - public TileEntity getTileEntityAtSideAndDistance(byte p0, int p1); + @Override + public TileEntity getTileEntityOffset(int p0, int p1, int p2); - @Override - public TileEntity getTileEntityOffset(int p0, int p1, int p2); + @Override + public World getWorld(); - @Override - public World getWorld(); + @Override + public int getXCoord(); - @Override - public int getXCoord(); + @Override + public short getYCoord(); - @Override - public short getYCoord(); + @Override + public int getZCoord(); - @Override - public int getZCoord(); + @Override + public boolean isClientSide(); - @Override - public boolean isClientSide(); + @Override + public boolean isDead(); - @Override - public boolean isDead(); + @Override + public boolean isInvalidTileEntity(); - @Override - public boolean isInvalidTileEntity(); + @Override + public boolean isServerSide(); - @Override - public boolean isServerSide(); + @Override + public void readFromNBT(NBTTagCompound p0); - @Override - public void readFromNBT(NBTTagCompound p0); + @Override + public void writeToNBT(NBTTagCompound p0); - @Override - public void writeToNBT(NBTTagCompound p0); - - @Override - public boolean acceptsRotationalEnergy(byte p0); + @Override + public boolean acceptsRotationalEnergy(byte p0); - @Override - public boolean injectRotationalEnergy(byte p0, long p1, long p2); + @Override + public boolean injectRotationalEnergy(byte p0, long p1, long p2); - @Override - public long injectEnergyUnits(byte p0, long p1, long p2); + @Override + public long injectEnergyUnits(byte p0, long p1, long p2); - @Override - public boolean inputEnergyFrom(byte p0); + @Override + public boolean inputEnergyFrom(byte p0); - @Override - public boolean outputsEnergyTo(byte p0); + @Override + public boolean outputsEnergyTo(byte p0); - @Override - public String[] getInfoData(); + @Override + public String[] getInfoData(); - @Override - default public boolean isGivingInformation() { - return true; - } + @Override + public default boolean isGivingInformation() { + return true; + } -/* boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2); + /* boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2); - boolean onTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2); - - boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2);*/ + boolean onTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2); + boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2);*/ } diff --git a/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java index 9e1a7431db..a643c86292 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java @@ -5,140 +5,133 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public interface ILazyCoverable extends ICoverable { - @Override - default byte getColorization() { - return 0; - } - - @Override - default byte setColorization(byte arg0) { - return 0; - } - - @Override - default byte getInputRedstoneSignal(byte arg0) { - return 0; - } - - @Override - default byte getStrongestRedstone() { - return 0; - } - - @Override - default boolean getRedstone() { - // TODO Auto-generated method stub - return false; - } - - @Override - default boolean getRedstone(byte arg0) { - return false; - } - - @Override - default boolean isUniversalEnergyStored(long arg0) { - return false; - } - - @Override - default long getUniversalEnergyStored() { - return 0; - } - - @Override - default long getUniversalEnergyCapacity() { - return 0; - } - - @Override - default long getStoredSteam() { - return 0; - } - - @Override - default long getSteamCapacity() { - return 0; - } - - @Override - default boolean increaseStoredSteam(long arg0, boolean arg2) { - return false; - } - - @Override - default byte getOutputRedstoneSignal(byte arg0) { - return 0; - } - - @Override - default void setOutputRedstoneSignal(byte arg0, byte arg1) { - - } - - @Override - default byte getStrongOutputRedstoneSignal(byte arg0) { - return 0; - } - - @Override - default void setStrongOutputRedstoneSignal(byte arg0, byte arg1) { - - } - - @Override - default byte getComparatorValue(byte arg0) { - return 0; - } - - @Override - default IGregTechTileEntity getIGregTechTileEntity(int arg0, int arg1, int arg2) { - return null; - } - - @Override - default IGregTechTileEntity getIGregTechTileEntityOffset(int arg0, int arg1, int arg2) { - return null; - } - - @Override - default IGregTechTileEntity getIGregTechTileEntityAtSide(byte arg0) { - return null; - } - - @Override - default IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte arg0, int arg1) { - return null; - } - - @Override - default byte getMetaID(int arg0, int arg1, int arg2) { - return 0; - } - - @Override - default byte getMetaIDOffset(int arg0, int arg1, int arg2) { - return 0; - } - - @Override - default byte getMetaIDAtSide(byte arg0) { - return 0; - } - - @Override - default byte getMetaIDAtSideAndDistance(byte arg0, int arg1) { - return 0; - } - - @Override - default boolean isDead() { - return false; - } - - @Override - default void setLightValue(byte arg0) { - - } - + @Override + default byte getColorization() { + return 0; + } + + @Override + default byte setColorization(byte arg0) { + return 0; + } + + @Override + default byte getInputRedstoneSignal(byte arg0) { + return 0; + } + + @Override + default byte getStrongestRedstone() { + return 0; + } + + @Override + default boolean getRedstone() { + // TODO Auto-generated method stub + return false; + } + + @Override + default boolean getRedstone(byte arg0) { + return false; + } + + @Override + default boolean isUniversalEnergyStored(long arg0) { + return false; + } + + @Override + default long getUniversalEnergyStored() { + return 0; + } + + @Override + default long getUniversalEnergyCapacity() { + return 0; + } + + @Override + default long getStoredSteam() { + return 0; + } + + @Override + default long getSteamCapacity() { + return 0; + } + + @Override + default boolean increaseStoredSteam(long arg0, boolean arg2) { + return false; + } + + @Override + default byte getOutputRedstoneSignal(byte arg0) { + return 0; + } + + @Override + default void setOutputRedstoneSignal(byte arg0, byte arg1) {} + + @Override + default byte getStrongOutputRedstoneSignal(byte arg0) { + return 0; + } + + @Override + default void setStrongOutputRedstoneSignal(byte arg0, byte arg1) {} + + @Override + default byte getComparatorValue(byte arg0) { + return 0; + } + + @Override + default IGregTechTileEntity getIGregTechTileEntity(int arg0, int arg1, int arg2) { + return null; + } + + @Override + default IGregTechTileEntity getIGregTechTileEntityOffset(int arg0, int arg1, int arg2) { + return null; + } + + @Override + default IGregTechTileEntity getIGregTechTileEntityAtSide(byte arg0) { + return null; + } + + @Override + default IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte arg0, int arg1) { + return null; + } + + @Override + default byte getMetaID(int arg0, int arg1, int arg2) { + return 0; + } + + @Override + default byte getMetaIDOffset(int arg0, int arg1, int arg2) { + return 0; + } + + @Override + default byte getMetaIDAtSide(byte arg0) { + return 0; + } + + @Override + default byte getMetaIDAtSideAndDistance(byte arg0, int arg1) { + return 0; + } + + @Override + default boolean isDead() { + return false; + } + + @Override + default void setLightValue(byte arg0) {} } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java b/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java index 67be182402..1f7991540a 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java @@ -3,38 +3,40 @@ package gtPlusPlus.api.interfaces; import gtPlusPlus.api.objects.Logger; public interface IPlugin { - - /** - * @return A {@link String} object which returns the {@link IPlugin}'s name. - */ - public String getPluginName(); - - /** - * @return - * A {@link String} object which returns the {@link IPlugin}'s short name. - * This String should only contain 4 Characters. - */ - public String getPluginAbbreviation(); - - /** - * @param message - A {@link String} object which holds a message to be logged to console. - */ - default void log(String message) { - Logger.INFO("["+getPluginAbbreviation()+"] "+message); - } - - /** - * @param message - A {@link String} object which holds a warning/error message to be logged to console. - */ - default void logDebug(String message) { - Logger.WARNING("["+getPluginAbbreviation()+"] "+message); - } - - public boolean preInit(); - public boolean init(); - public boolean postInit(); - - public boolean serverStart(); - public boolean serverStop(); - + + /** + * @return A {@link String} object which returns the {@link IPlugin}'s name. + */ + public String getPluginName(); + + /** + * @return + * A {@link String} object which returns the {@link IPlugin}'s short name. + * This String should only contain 4 Characters. + */ + public String getPluginAbbreviation(); + + /** + * @param message - A {@link String} object which holds a message to be logged to console. + */ + default void log(String message) { + Logger.INFO("[" + getPluginAbbreviation() + "] " + message); + } + + /** + * @param message - A {@link String} object which holds a warning/error message to be logged to console. + */ + default void logDebug(String message) { + Logger.WARNING("[" + getPluginAbbreviation() + "] " + message); + } + + public boolean preInit(); + + public boolean init(); + + public boolean postInit(); + + public boolean serverStart(); + + public boolean serverStop(); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java b/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java index 233fb93d4d..b61528e4b9 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java @@ -51,5 +51,4 @@ public interface IRandomGenerator { * @return and int with the LSB being random */ public int next(int numBits); - } diff --git a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java index 47e692bffb..815c399caf 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java @@ -1,14 +1,12 @@ package gtPlusPlus.api.interfaces; -import net.minecraft.block.Block; - import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; +import net.minecraft.block.Block; -public interface ITexturedBlock extends ITexturedTileEntity{ +public interface ITexturedBlock extends ITexturedTileEntity { - ITexture[] getTexture(byte side); - - ITexture[] getTexture(Block block, byte side); + ITexture[] getTexture(byte side); + ITexture[] getTexture(Block block, byte side); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java b/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java index 08866c2712..97c734659d 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java @@ -2,6 +2,5 @@ package gtPlusPlus.api.interfaces; public interface ITileTooltip { - public abstract int getTooltipID(); - + public abstract int getTooltipID(); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IToolable.java b/src/main/java/gtPlusPlus/api/interfaces/IToolable.java index 24797825a9..d696585b76 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IToolable.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IToolable.java @@ -2,16 +2,21 @@ package gtPlusPlus.api.interfaces; public interface IToolable { - public boolean isScrewdriverable(); - public boolean onScrewdriverLMB(); - public boolean onScrewdriverRMB(); - - public boolean isWrenchable(); - public boolean onWrenchLMB(); - public boolean onWrenchRMB(); - - public boolean isMalletable(); - public boolean onMalletLMB(); - public boolean onMalletRMB(); - + public boolean isScrewdriverable(); + + public boolean onScrewdriverLMB(); + + public boolean onScrewdriverRMB(); + + public boolean isWrenchable(); + + public boolean onWrenchLMB(); + + public boolean onWrenchRMB(); + + public boolean isMalletable(); + + public boolean onMalletLMB(); + + public boolean onMalletRMB(); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java b/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java index 4f4b9d7acd..c9415f6155 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java +++ b/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java @@ -2,11 +2,9 @@ package gtPlusPlus.api.interfaces; public interface RunnableWithInfo<V> extends Runnable { - public V getInfoData(); - - default public Class<?> getInfoDataType() { - return getInfoData().getClass(); - } - - + public V getInfoData(); + + public default Class<?> getInfoDataType() { + return getInfoData().getClass(); + } } |