tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

A few tiny fixes

Browse source
This commit is contained in:
Aidan C. Brady 2014-02-12 19:05:43 -05:00
parent 4c4f534e5b
commit cf73d1f2c0
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/transporter/TItemStackFilter.java
View file

@ -33,7 +33,7 @@ public class TItemStackFilter extends TransporterFilter
return false; return false;
} }
return itemType.isItemEqual(itemStack) && (!sizeMode || itemStack.stackSize >= min); return (itemType.getHasSubtypes() ? itemType.isItemEqual(itemStack) : itemType.itemID == itemStack.itemID) && (!sizeMode || itemStack.stackSize >= min);
} }
@Override @Override

9
common/mekanism/generators/common/tile/TileEntitySolarGenerator.java
View file

@ -68,7 +68,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
if(!worldObj.isRemote) if(!worldObj.isRemote)
{ {
if(worldObj.isDaytime() && !worldObj.isRaining() && !worldObj.isThundering() && !worldObj.provider.hasNoSky && worldObj.canBlockSeeTheSky(xCoord, yCoord+1, zCoord)) if(worldObj.isDaytime() && ((!worldObj.isRaining() && !worldObj.isThundering()) || isDesert()) && !worldObj.provider.hasNoSky && worldObj.canBlockSeeTheSky(xCoord, yCoord+1, zCoord))
{ {
seesSun = true; seesSun = true;
} }
@ -87,6 +87,11 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
} }
} }
public boolean isDesert()
{
return worldObj.provider.getBiomeGenForCoords(xCoord >> 4, zCoord >> 4) instanceof BiomeGenDesert;
}
@Override @Override
public boolean canExtractItem(int slotID, ItemStack itemstack, int side) public boolean canExtractItem(int slotID, ItemStack itemstack, int side)
{ {
@ -128,7 +133,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
ret *= ((ISolarLevel)worldObj.provider).getSolarEnergyMultiplier(); ret *= ((ISolarLevel)worldObj.provider).getSolarEnergyMultiplier();
} }
if(worldObj.provider.getBiomeGenForCoords(xCoord >> 4, zCoord >> 4) instanceof BiomeGenDesert) if(isDesert())
{ {
ret *= 1.5; ret *= 1.5;
} }