aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/api/thermal
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/api/thermal')
-rw-r--r--src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java4
-rw-r--r--src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java4
-rw-r--r--src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java4
-rw-r--r--src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java7
4 files changed, 19 insertions, 0 deletions
diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java
index 6f0235f4d7..e50ae45003 100644
--- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java
+++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java
@@ -4,11 +4,15 @@ import net.minecraftforge.common.util.ForgeDirection;
public interface IThermalHandler extends IThermalProvider, IThermalReceiver {
+ @Override
int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2);
+ @Override
int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2);
+ @Override
int getThermalEnergyStored(ForgeDirection arg0);
+ @Override
int getMaxThermalEnergyStored(ForgeDirection arg0);
}
diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
index 60efc687dc..a2c29ba76a 100644
--- a/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
+++ b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java
@@ -85,6 +85,7 @@ public class ThermalStorage implements IThermalStorage {
}
}
+ @Override
public int receiveThermalEnergy(int arg0, boolean arg1) {
int arg2 = Math.min(this.capacity - this.thermal_energy, Math.min(this.maxReceive, arg0));
if (!arg1) {
@@ -94,6 +95,7 @@ public class ThermalStorage implements IThermalStorage {
return arg2;
}
+ @Override
public int extractThermalEnergy(int arg0, boolean arg1) {
int arg2 = Math.min(this.thermal_energy, Math.min(this.maxExtract, arg0));
if (!arg1) {
@@ -103,10 +105,12 @@ public class ThermalStorage implements IThermalStorage {
return arg2;
}
+ @Override
public int getThermalEnergyStored() {
return this.thermal_energy;
}
+ @Override
public int getMaxThermalEnergyStored() {
return this.capacity;
}
diff --git a/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java
index 57eb1d2c43..ff0cf06188 100644
--- a/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java
+++ b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java
@@ -46,6 +46,7 @@ public class ItemThermalContainer extends Item implements IThermalContainerItem
this.maxExtract = arg0;
}
+ @Override
public int receiveThermalEnergy(ItemStack arg0, int arg1, boolean arg2) {
if (arg0.getTagCompound() == null) {
arg0.stackTagCompound = new NBTTagCompound();
@@ -59,6 +60,7 @@ public class ItemThermalContainer extends Item implements IThermalContainerItem
return arg4;
}
+ @Override
public int extractThermalEnergy(ItemStack arg0, int arg1, boolean arg2) {
if (arg0.stackTagCompound != null && arg0.stackTagCompound.hasKey("ThermalEnergy")) {
int arg3 = arg0.stackTagCompound.getInteger("ThermalEnergy");
@@ -73,12 +75,14 @@ public class ItemThermalContainer extends Item implements IThermalContainerItem
}
}
+ @Override
public int getThermalEnergyStored(ItemStack arg0) {
return arg0.stackTagCompound != null && arg0.stackTagCompound.hasKey("ThermalEnergy")
? arg0.stackTagCompound.getInteger("ThermalEnergy")
: 0;
}
+ @Override
public int getMaxThermalEnergyStored(ItemStack arg0) {
return this.capacity;
}
diff --git a/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java
index 8ee401c474..a41b6428cb 100644
--- a/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java
+++ b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java
@@ -11,32 +11,39 @@ public class TileThermalHandler extends TileEntity implements IThermalHandler {
protected ThermalStorage storage = new ThermalStorage(32000);
+ @Override
public void readFromNBT(NBTTagCompound arg0) {
super.readFromNBT(arg0);
this.storage.readFromNBT(arg0);
}
+ @Override
public void writeToNBT(NBTTagCompound arg0) {
super.writeToNBT(arg0);
this.storage.writeToNBT(arg0);
}
+ @Override
public boolean canConnectThermalEnergy(ForgeDirection arg0) {
return true;
}
+ @Override
public int receiveThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2) {
return this.storage.receiveThermalEnergy(arg1, arg2);
}
+ @Override
public int extractThermalEnergy(ForgeDirection arg0, int arg1, boolean arg2) {
return this.storage.extractThermalEnergy(arg1, arg2);
}
+ @Override
public int getThermalEnergyStored(ForgeDirection arg0) {
return this.storage.getThermalEnergyStored();
}
+ @Override
public int getMaxThermalEnergyStored(ForgeDirection arg0) {
return this.storage.getMaxThermalEnergyStored();
}