upstream/WailaHarvestability
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/WailaHarvestability.git synced 2026-10-25 20:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GregTech harvestability info

Browse Source 
* The disguise code was getting in the way
 * Fixes #28
This commit is contained in:
squeek committed 2015-10-29 21:15:27 -07:00
1 parent a5c57f68b3
commit 97cb98247f
2 files changed
+27 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/squeek/wailaharvestability/WailaHandler.java
+9 -8
View File
@@ -29,6 +29,7 @@ import squeek.wailaharvestability.helpers.OreHelper;
import squeek.wailaharvestability.helpers.StringHelper;
import squeek.wailaharvestability.helpers.ToolHelper;
import squeek.wailaharvestability.proxy.ProxyCreativeBlocks;
import squeek.wailaharvestability.proxy.ProxyGregTech;
public class WailaHandler implements IWailaDataProvider
{
@@ -56,17 +57,17 @@ public class WailaHandler implements IWailaDataProvider
EntityPlayer player = accessor.getPlayer();
// for disguised blocks
if (itemStack.getItem() instanceof ItemBlock)
if (!ProxyGregTech.isOreBlock(block) && itemStack.getItem() instanceof ItemBlock)
{
block = Block.getBlockFromItem(itemStack.getItem());
meta = itemStack.getItemDamage();
}
boolean minimalLayout = config.getConfig("harvestability.minimal", false);
List<String> stringParts = new ArrayList<String>();
getHarvestability(stringParts, player, block, meta, accessor.getPosition(), config, minimalLayout);
if (!stringParts.isEmpty())
{
if (minimalLayout)
@@ -74,10 +75,10 @@ public class WailaHandler implements IWailaDataProvider
else
toolTip.addAll(stringParts);
}
return toolTip;
}
public void getHarvestability(List<String> stringList, EntityPlayer player, Block block, int meta, MovingObjectPosition position, IWailaConfigHandler config, boolean minimalLayout)
{
boolean isSneaking = player.isSneaking();
@@ -158,12 +159,12 @@ public class WailaHandler implements IWailaDataProvider
stringList.add((!minimalLayout ? StatCollector.translateToLocal("wailaharvestability.harvestlevel") : "") + ColorHelper.getBooleanColor(isAboveMinHarvestLevel && canHarvest) + StringHelper.stripFormatting(StringHelper.getHarvestLevelName(harvestLevel)));
}
}
public String getShearabilityString(EntityPlayer player, Block block, int meta, MovingObjectPosition position, IWailaConfigHandler config)
{
boolean isSneaking = player.isSneaking();
boolean showShearability = config.getConfig("harvestability.shearability") && (!config.getConfig("harvestability.shearability.sneakingonly") || isSneaking);
if (showShearability && (block instanceof IShearable || block == Blocks.deadbush || (block == Blocks.double_plant && block.getItemDropped(meta, new Random(), 0) == null)))
{
ItemStack itemHeld = player.getHeldItem();
@@ -178,7 +179,7 @@ public class WailaHandler implements IWailaDataProvider
{
boolean isSneaking = player.isSneaking();
boolean showSilkTouchability = config.getConfig("harvestability.silktouchability") && (!config.getConfig("harvestability.silktouchability.sneakingonly") || isSneaking);
if (showSilkTouchability && block.canSilkHarvest(player.worldObj, player, position.blockX, position.blockY, position.blockZ, meta))
{
Item itemDropped = block.getItemDropped(meta, new Random(), 0);
java/squeek/wailaharvestability/proxy/ProxyGregTech.java
+18
View File
@@ -0,0 +1,18 @@
package squeek.wailaharvestability.proxy;
import net.minecraft.block.Block;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
public class ProxyGregTech
{
public static final String modID = "gregtech";
public static final String oreBlockID = "gt.blockores";
public static final String oreBlockUniqueIdentifier = modID + ":" + oreBlockID;
public static boolean isModLoaded = Loader.isModLoaded(modID);
public static boolean isOreBlock(Block block)
{
return isModLoaded && GameRegistry.findUniqueIdentifierFor(block).toString().equals(oreBlockUniqueIdentifier);
}
}