Fix Waila provider

This commit is contained in:
Justin Aquadro committed 2014-09-15 00:54:16 -04:00
1 parent 77cc67a4f6
commit 45fe9e3667
2 files changed
+47 -30

No files matched your search

@@ -60,6 +60,14 @@ public class TileEntityCompDrawers extends TileEntityDrawersBase implements ISto
return pooledCount / convRate[slot];
}
public int getItemRemainderCount (int slot) {
int count = getItemCount(slot);
if (slot > 0)
count -= getItemCount(slot - 1) * (convRate[slot - 1] / convRate[slot]);
return count;
}
public int getItemCapacity (int slot) {
if (!isSlotValid(slot))
return 0;
@@ -1,7 +1,10 @@
package com.jaquadro.minecraft.storagedrawers.compat;
import com.jaquadro.minecraft.storagedrawers.block.BlockCompDrawers;
import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers;
import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityCompDrawers;
import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers;
import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersBase;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
@@ -14,41 +17,47 @@ import java.util.List;
/**
* @author dmillerw
*/
public class WailaProvider implements IWailaDataProvider {
public class WailaProvider
{
public static void registerProvider(IWailaRegistrar registrar) {
registrar.registerBodyProvider(new WailaProvider(), BlockDrawers.class);
registrar.registerBodyProvider(new WailaDrawer(), BlockDrawers.class);
}
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
}
@Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
TileEntityDrawers tile = (TileEntityDrawers) accessor.getTileEntity();
currenttip.add(StatCollector.translateToLocalFormatted("storageDrawers.waila.level", tile.getLevel()));
for (int i=0; i<tile.getDrawerCount(); i++) {
String name = StatCollector.translateToLocal("storageDrawers.waila.empty");
ItemStack stack = tile.getSingleItemStack(i);
if (stack != null && stack.getItem() != null) {
name = stack.getDisplayName() + " [" + tile.getItemCount(i) + "]";
}
currenttip.add(StatCollector.translateToLocalFormatted("storageDrawers.waila.drawer", i + 1, name));
public static class WailaDrawer implements IWailaDataProvider
{
@Override
public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
}
return currenttip;
}
@Override
public List<String> getWailaHead (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
@Override
public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
TileEntityDrawersBase tile = (TileEntityDrawersBase) accessor.getTileEntity();
currenttip.add(StatCollector.translateToLocalFormatted("storageDrawers.waila.level", tile.getLevel()));
for (int i = 0; i < tile.getDrawerCount(); i++) {
String name = StatCollector.translateToLocal("storageDrawers.waila.empty");
ItemStack stack = tile.getSingleItemStack(i);
if (stack != null && stack.getItem() != null) {
if (tile instanceof TileEntityCompDrawers)
name = stack.getDisplayName() + ((i == 0) ? " [" : " [+") + ((TileEntityCompDrawers) tile).getItemRemainderCount(i) + "]";
else
name = stack.getDisplayName() + " [" + tile.getItemCount(i) + "]";
}
currenttip.add(StatCollector.translateToLocalFormatted("storageDrawers.waila.drawer", i + 1, name));
}
return currenttip;
}
@Override
public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
}