aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2015-11-03 12:06:55 +0100
committerDream-Master <dream-master@gmx.net>2015-11-03 12:06:55 +0100
commitc32369a8f549d8f67dc7a27a88250e13a4298791 (patch)
tree863316c08c694bbf429f34823aa34a7240acddcc /src/main/java/gregtech/common/blocks
parente4859f2a1f8682f7993d7056355eb3457f97a98a (diff)
downloadGT5-Unofficial-c32369a8f549d8f67dc7a27a88250e13a4298791.tar.gz
GT5-Unofficial-c32369a8f549d8f67dc7a27a88250e13a4298791.tar.bz2
GT5-Unofficial-c32369a8f549d8f67dc7a27a88250e13a4298791.zip
Adding Colant Cells to Gt Mixer
Add Caesium Burn value Add Block Harvet Level (copy from Gt 5.09. code)
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
index c8706776b2..a17590e575 100644
--- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
@@ -1,5 +1,6 @@
package gregtech.common.blocks;
+import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -32,7 +33,12 @@ public class GT_TileEntity_Ores
public static byte getHarvestData(short aMetaData) {
Materials aMaterial = GregTech_API.sGeneratedMaterials[(aMetaData % 1000)];
- return aMaterial == null ? 0 : (byte) Math.max((aMetaData % 16000 / 1000 == 3) || (aMetaData % 16000 / 1000 == 4) ? 3 : 0, Math.min(7, aMaterial.mToolQuality - (aMetaData < 16000 ? 0 : 1)));
+ byte tByte = aMaterial == null ? 0 : (byte) Math.max((aMetaData % 16000 / 1000 == 3) || (aMetaData % 16000 / 1000 == 4) ? 3 : 0, Math.min(7, aMaterial.mToolQuality - (aMetaData < 16000 ? 0 : 1)));
+ if(GT_Mod.gregtechproxy.mChangeHarvestLevels ){
+ tByte = aMaterial == null ? 0 : (byte) Math.max((aMetaData % 16000 / 1000 == 3) || (aMetaData % 16000 / 1000 == 4) ? GT_Mod.gregtechproxy.mGraniteHavestLevel : 0, Math.min(GT_Mod.gregtechproxy.mMaxHarvestLevel, GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] - (aMetaData < 16000 ? 0 : 1)));
+ }
+ return tByte;
+
}
public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData) {