aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-07-27 01:58:32 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-07-27 01:58:32 +0200
commitb4bcebf4583a0cac5b59a30b23cd8bb41422c7d4 (patch)
tree6cdc8f166427f0d99b9b3395a8a536b8f7bfe497 /src
parenta35cb1084f7377c23a7bc8716848037c6197b62e (diff)
downloadGT5-Unofficial-b4bcebf4583a0cac5b59a30b23cd8bb41422c7d4.tar.gz
GT5-Unofficial-b4bcebf4583a0cac5b59a30b23cd8bb41422c7d4.tar.bz2
GT5-Unofficial-b4bcebf4583a0cac5b59a30b23cd8bb41422c7d4.zip
Handle fuel value as integer
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java4
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index 83fe3ff509..be85ca29ce 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -206,8 +206,8 @@ public class GT_ModHandler {
/**
* @return the Value of this Stack, when burning inside a Furnace (200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU)), limited to Short because the vanilla Furnace otherwise can't handle it properly, stupid Mojang...
*/
- public static short getFuelValue(ItemStack aStack) {
- return (short) TileEntityFurnace.getItemBurnTime(aStack);
+ public static int getFuelValue(ItemStack aStack) {
+ return TileEntityFurnace.getItemBurnTime(aStack);
}
/**
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 574ed1e560..f9cf4f9750 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -1748,10 +1748,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
rFuelValue = (short) Math.max(rFuelValue, 600);
}
if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_MSSFUEL.get(1, new Object[0]))) {
- rFuelValue = (short) Math.max(rFuelValue, 150000);
+ rFuelValue = Math.max(rFuelValue, 150000);
}
if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_SSFUEL.get(1, new Object[0]))) {
- rFuelValue = (short) Math.max(rFuelValue, 100000);
+ rFuelValue = Math.max(rFuelValue, 100000);
}
return rFuelValue;