From cf73d1f2c0768f55756003f2b2a5b13bdae78e5a Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 12 Feb 2014 19:05:43 -0500 Subject: [PATCH] A few tiny fixes --- common/mekanism/common/transporter/TItemStackFilter.java | 2 +- .../generators/common/tile/TileEntitySolarGenerator.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/mekanism/common/transporter/TItemStackFilter.java b/common/mekanism/common/transporter/TItemStackFilter.java index 687e5214b..e7628525c 100644 --- a/common/mekanism/common/transporter/TItemStackFilter.java +++ b/common/mekanism/common/transporter/TItemStackFilter.java @@ -33,7 +33,7 @@ public class TItemStackFilter extends TransporterFilter 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 diff --git a/common/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/common/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 85aab487d..c58ecc60e 100644 --- a/common/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/common/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -68,7 +68,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator 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; } @@ -87,6 +87,11 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } } + public boolean isDesert() + { + return worldObj.provider.getBiomeGenForCoords(xCoord >> 4, zCoord >> 4) instanceof BiomeGenDesert; + } + @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { @@ -128,7 +133,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator ret *= ((ISolarLevel)worldObj.provider).getSolarEnergyMultiplier(); } - if(worldObj.provider.getBiomeGenForCoords(xCoord >> 4, zCoord >> 4) instanceof BiomeGenDesert) + if(isDesert()) { ret *= 1.5; }