Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Apply the fixes GT Shim does

Browse source 
Clean up block checking too
This commit is contained in:
Chocohead 2017-03-05 22:09:23 +00:00 committed by GitHub
parent 8a939b3e72
commit 2163ddc2d6
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/gregtech/api/util/GT_BaseCrop.java
View file

@ -169,7 +169,7 @@ public class GT_BaseCrop extends CropCard {
@Override
public ItemStack getGain(ICropTile aCrop) {
int tDrop;
if (mSpecialDrops != null && (tDrop = aCrop.getWorld().rand.nextInt((mSpecialDrops.length*2) + 2)) < mSpecialDrops.length && mSpecialDrops[tDrop] != null) {
if (mSpecialDrops != null && (tDrop = aCrop.getWorldObj().rand.nextInt((mSpecialDrops.length*2) + 2)) < mSpecialDrops.length && mSpecialDrops[tDrop] != null) {
return GT_Utility.copy(mSpecialDrops[tDrop]);
}
return GT_Utility.copy(mDrop);
@ -195,14 +195,13 @@ public class GT_BaseCrop extends CropCard {
return false;
}
for (int i = 1; i < this.getRootsLength(aCrop); i++) {
IBlockState downState = aCrop.getWorld().getBlockState(aCrop.getLocation().down());
IBlockState downState = aCrop.getWorldObj().getBlockState(aCrop.getPosition().down(i));
int tMetaID = downState.getBlock().getMetaFromState(downState);
ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(downState.getBlock(), 1, tMetaID));
if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore")) && (tAssotiation.mMaterial.mMaterial == mBlock)) {
return true;
}
if ((tAssotiation != null) && (tAssotiation.mPrefix == OrePrefixes.block) && (tAssotiation.mMaterial.mMaterial == mBlock)) {
return true;
if (tAssotiation != null && tAssotiation.mMaterial.mMaterial == mBlock) {
if (tAssotiation.mPrefix.toString().startsWith("ore") || tAssotiation.mPrefix == OrePrefixes.block) {
return true;
}
}
}
return false;