aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces/tileentity
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2022-08-27 10:19:57 +0100
committerGitHub <noreply@github.com>2022-08-27 11:19:57 +0200
commit6f31720697bcc351421a4d86ba3bf749375dd12c (patch)
tree3adf8f318f22c892d74cd7c9d30b6dd3f11f11bd /src/main/java/gregtech/api/interfaces/tileentity
parentc3eac50decd33ee2be8703dfb2ecf9cdc31c2b67 (diff)
downloadGT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.tar.gz
GT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.tar.bz2
GT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.zip
Update buildscript & apply spotless (#1306)
* Update dependencies * Update buildscript, apply spotless
Diffstat (limited to 'src/main/java/gregtech/api/interfaces/tileentity')
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java12
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java6
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java3
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java16
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java36
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java11
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java44
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java15
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java1
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java2
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java5
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java3
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java1
13 files changed, 105 insertions, 50 deletions
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
index ca3db3354e..7b0bc9c690 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
@@ -80,12 +80,16 @@ public interface IBasicEnergyContainer extends IEnergyConnected {
/**
* returns the amount of Steam contained in this Block, in EU units!
*/
- default long getStoredSteam() { return 0; }
+ default long getStoredSteam() {
+ return 0;
+ }
/**
* returns the amount of Steam containable in this Block, in EU units!
*/
- default long getSteamCapacity() { return 0; }
+ default long getSteamCapacity() {
+ return 0;
+ }
/**
* Increases stored Energy. Energy Base Value is in EU, even though it's Steam!
@@ -96,5 +100,7 @@ public interface IBasicEnergyContainer extends IEnergyConnected {
* <p/>
* And yes, you can't directly decrease the Steam of a Machine. That is done by decreaseStoredEnergyUnits
*/
- default boolean increaseStoredSteam(long aEnergy, boolean aIgnoreTooMuchEnergy) { return false; }
+ default boolean increaseStoredSteam(long aEnergy, boolean aIgnoreTooMuchEnergy) {
+ return false;
+ }
}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
index e496479bed..6beb34a305 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
@@ -22,8 +22,11 @@ public interface ICoverable extends IRedstoneTileEntity, IHasInventory, IBasicEn
}
void setCoverIdAndDataAtSide(byte aSide, int aId, ISerializableObject aData);
+
void setCoverIDAtSide(byte aSide, int aID);
+
boolean setCoverIDAtSideNoUpdate(byte aSide, int aID);
+
void setCoverItemAtSide(byte aSide, ItemStack aCover);
@Deprecated
@@ -71,7 +74,8 @@ public interface ICoverable extends IRedstoneTileEntity, IHasInventory, IBasicEn
* Receiving a packet with cover data.
* @param aPlayer the player who made the change
*/
- default void receiveCoverData(byte aCoverSide, int aCoverID, ISerializableObject aCoverData, EntityPlayerMP aPlayer) {
+ default void receiveCoverData(
+ byte aCoverSide, int aCoverID, ISerializableObject aCoverData, EntityPlayerMP aPlayer) {
if (aCoverData instanceof ISerializableObject.LegacyCoverData)
receiveCoverData(aCoverSide, aCoverID, ((ISerializableObject.LegacyCoverData) aCoverData).get());
}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java
index 0063eb57c6..4e3b03d970 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java
@@ -1,8 +1,7 @@
package gregtech.api.interfaces.tileentity;
-import net.minecraft.entity.player.EntityPlayer;
-
import java.util.ArrayList;
+import net.minecraft.entity.player.EntityPlayer;
public interface IDebugableTileEntity {
/**
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index 702f19a89d..c1ecc2b153 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -63,15 +63,21 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
final byte tColor = ((IEnergyConnected) tTileEntity).getColorization();
if (tColor >= 0 && tColor != aEmitter.getColorization()) continue;
}
- rUsedAmperes += ((IEnergyConnected) tTileEntity).injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes);
+ rUsedAmperes += ((IEnergyConnected) tTileEntity)
+ .injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes);
} else if (tTileEntity instanceof IEnergySink) {
- if (((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) {
- while (aAmperage > rUsedAmperes && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink) tTileEntity).injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage) < aVoltage)
- rUsedAmperes++;
+ if (((IEnergySink) tTileEntity)
+ .acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) {
+ while (aAmperage > rUsedAmperes
+ && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0
+ && ((IEnergySink) tTileEntity)
+ .injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage)
+ < aVoltage) rUsedAmperes++;
}
} else if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver) {
- final ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();
+ final ForgeDirection tDirection =
+ ForgeDirection.getOrientation(i).getOpposite();
final int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100);
if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) {
((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false);
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java
index 2a8172a775..936de80b3e 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java
@@ -50,12 +50,16 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW
Class tClass = cofh.api.energy.IEnergyReceiver.class;
tClass.getCanonicalName();
RF_ENERGY = true;
- } catch (Throwable e) {/**/}
+ } catch (Throwable e) {
+ /**/
+ }
try {
Class tClass = ic2.api.energy.tile.IEnergySink.class;
tClass.getCanonicalName();
IC_ENERGY = true;
- } catch (Throwable e) {/**/}
+ } catch (Throwable e) {
+ /**/
+ }
CHECK_ALL = false;
}
}
@@ -65,7 +69,8 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW
*
* @return the amount of used secondary value.
*/
- public static final long emitEnergyToNetwork(SubTag aEnergyType, long aPrimary, long aSecondary, IExperimentalEnergyTileEntity aEmitter) {
+ public static final long emitEnergyToNetwork(
+ SubTag aEnergyType, long aPrimary, long aSecondary, IExperimentalEnergyTileEntity aEmitter) {
long rUsedSecondary = 0;
checkAvailabilities();
for (byte i = 0, j = 0; i < 6 && aSecondary > rUsedSecondary; i++)
@@ -77,14 +82,25 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW
byte tColor = ((IExperimentalEnergyTileEntity) tTileEntity).getColorization();
if (tColor >= 0 && tColor != aEmitter.getColorization()) continue;
}
- rUsedSecondary += ((IExperimentalEnergyTileEntity) tTileEntity).injectEnergy(aEnergyType, j, aPrimary, aSecondary - rUsedSecondary);
- } else if (IC_ENERGY && aEnergyType == SubTag.ENERGY_ELECTRICITY && tTileEntity instanceof IEnergySink) {
- if (((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) {
- while (aSecondary > rUsedSecondary && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink) tTileEntity).injectEnergy(ForgeDirection.getOrientation(j), aPrimary, aPrimary) < aPrimary)
- rUsedSecondary++;
+ rUsedSecondary += ((IExperimentalEnergyTileEntity) tTileEntity)
+ .injectEnergy(aEnergyType, j, aPrimary, aSecondary - rUsedSecondary);
+ } else if (IC_ENERGY
+ && aEnergyType == SubTag.ENERGY_ELECTRICITY
+ && tTileEntity instanceof IEnergySink) {
+ if (((IEnergySink) tTileEntity)
+ .acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) {
+ while (aSecondary > rUsedSecondary
+ && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0
+ && ((IEnergySink) tTileEntity)
+ .injectEnergy(ForgeDirection.getOrientation(j), aPrimary, aPrimary)
+ < aPrimary) rUsedSecondary++;
}
- } else if (RF_ENERGY && aEnergyType == SubTag.ENERGY_REDSTONE_FLUX && tTileEntity instanceof IEnergyReceiver && ((IEnergyReceiver) tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))) {
- rUsedSecondary += ((IEnergyReceiver) tTileEntity).receiveEnergy(ForgeDirection.getOrientation(j), (int) aSecondary, false);
+ } else if (RF_ENERGY
+ && aEnergyType == SubTag.ENERGY_REDSTONE_FLUX
+ && tTileEntity instanceof IEnergyReceiver
+ && ((IEnergyReceiver) tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))) {
+ rUsedSecondary += ((IEnergyReceiver) tTileEntity)
+ .receiveEnergy(ForgeDirection.getOrientation(j), (int) aSecondary, false);
}
}
return rUsedSecondary;
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java b/src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java
index cd4810eba6..77b894fea7 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java
@@ -5,16 +5,15 @@ public interface IGTEnet {
/**
* @return true if this Device consumes Energy at all
*/
- default boolean isEnetInput() {
- return false;
+ default boolean isEnetInput() {
+ return false;
}
-
+
/**
- *
+ *
* @return true if this Device emits Energy at all
*/
- default boolean isEnetOutput() {
+ default boolean isEnetOutput() {
return false;
}
-
}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
index 94b93434e2..253deae29b 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
@@ -5,6 +5,9 @@ import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.interfaces.IDescribable;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.common.blocks.GT_Block_Machines;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -13,10 +16,6 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.fluids.IFluidHandler;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
/**
* A simple compound Interface for all my TileEntities.
* <p/>
@@ -24,7 +23,18 @@ import java.util.UUID;
* <p/>
* It can cause Problems to include this Interface!
*/
-public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTileEntity, ICoverable, IFluidHandler, ITurnable, IGregTechDeviceInformation, IUpgradableMachine, IDigitalChest, IDescribable, IMachineBlockUpdateable, IGregtechWailaProvider {
+public interface IGregTechTileEntity
+ extends ITexturedTileEntity,
+ IGearEnergyTileEntity,
+ ICoverable,
+ IFluidHandler,
+ ITurnable,
+ IGregTechDeviceInformation,
+ IUpgradableMachine,
+ IDigitalChest,
+ IDescribable,
+ IMachineBlockUpdateable,
+ IGregtechWailaProvider {
/**
* gets the Error displayed on the GUI
*/
@@ -133,7 +143,14 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil
*/
int getLightOpacity();
- void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List<AxisAlignedBB> outputAABB, Entity collider);
+ void addCollisionBoxesToList(
+ World aWorld,
+ int aX,
+ int aY,
+ int aZ,
+ AxisAlignedBB inputAABB,
+ List<AxisAlignedBB> outputAABB,
+ Entity collider);
AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ);
@@ -143,8 +160,8 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil
* Checks validity of meta tile and delegates to it
*/
@Override
- default void onMachineBlockUpdate(){
- if(!isDead() && getMetaTileEntity() != null && getMetaTileEntity().getBaseMetaTileEntity() == this){
+ default void onMachineBlockUpdate() {
+ if (!isDead() && getMetaTileEntity() != null && getMetaTileEntity().getBaseMetaTileEntity() == this) {
getMetaTileEntity().onMachineBlockUpdate();
}
}
@@ -154,12 +171,15 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil
*/
@Override
default boolean isMachineBlockUpdateRecursive() {
- return !isDead() && getMetaTileEntity() != null &&
- getMetaTileEntity().getBaseMetaTileEntity() == this &&
- getMetaTileEntity().isMachineBlockUpdateRecursive();
+ return !isDead()
+ && getMetaTileEntity() != null
+ && getMetaTileEntity().getBaseMetaTileEntity() == this
+ && getMetaTileEntity().isMachineBlockUpdateRecursive();
}
- default void setShutdownStatus(boolean newStatus) {return;}
+ default void setShutdownStatus(boolean newStatus) {
+ return;
+ }
/**
* A randomly called display update to be able to add particles or other items for display
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java
index ee3da0fa6f..a463cc91df 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java
@@ -1,5 +1,6 @@
package gregtech.api.interfaces.tileentity;
+import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -8,10 +9,16 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
-import java.util.List;
-
public interface IGregtechWailaProvider {
- default void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {}
+ default void getWailaBody(
+ ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {}
- default void getWailaNBTData(final EntityPlayerMP player, final TileEntity tile, final NBTTagCompound tag, final World world, int x, int y, int z) {}
+ default void getWailaNBTData(
+ final EntityPlayerMP player,
+ final TileEntity tile,
+ final NBTTagCompound tag,
+ final World world,
+ int x,
+ int y,
+ int z) {}
}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java b/src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java
index ee3516dfac..2593f1f3b5 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java
@@ -13,5 +13,4 @@ public interface IIC2Enet {
* Update the ic2 enet
*/
void doEnetUpdate();
-
}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java b/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java
index 31590f3d57..b8ce51a212 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java
@@ -17,7 +17,7 @@ public interface IMachineBlockUpdateable {
/**
* Should recurse?
*/
- default boolean isMachineBlockUpdateRecursive(){
+ default boolean isMachineBlockUpdateRecursive() {
return true;
}
}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java b/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java
index 0c342b8cfc..54fa90218a 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java
@@ -49,7 +49,9 @@ public interface IMachineProgress extends IHasWorldObjectAndCoords {
* 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.
*/
- default byte getWorkDataValue() { return 0; }
+ default byte getWorkDataValue() {
+ return 0;
+ }
/**
* used to control Machines via Redstone Signal Strength by special Covers
@@ -73,5 +75,4 @@ public interface IMachineProgress extends IHasWorldObjectAndCoords {
default boolean wasShutdown() {
return false;
}
-
}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java b/src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java
index 8c8ce443b0..e05fd44637 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java
@@ -1,6 +1,5 @@
package gregtech.api.interfaces.tileentity;
-
import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
/**
@@ -38,7 +37,7 @@ public interface ITurnable {
*/
default boolean[] getValidFacings() {
final boolean[] validFacings = new boolean[6];
- for(byte facing : ALL_VALID_SIDES) {
+ for (byte facing : ALL_VALID_SIDES) {
validFacings[facing] = isValidFacing(facing);
}
return validFacings;
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java b/src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java
index 0d027f6e30..cc59a4af34 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java
@@ -1,6 +1,5 @@
package gregtech.api.interfaces.tileentity;
-
/**
* To access my Machines a bit easier
*/