This commit is contained in:
CrazyPants committed 2014-12-15 12:58:23 +08:00
commit 166cc4e659
4 files changed
+13 -6

No files matched your search

@@ -7,8 +7,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.oredict.ShapedOreRecipe;
import appeng.api.AEApi;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.Optional.Method;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
@@ -219,6 +219,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
if(conduitsDirty) {
if(!worldObj.isRemote) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
markDirty();
}
conduitsDirty = false;
}
@@ -71,7 +71,11 @@ public class WailaCompat implements IWailaDataProvider {
IFacade bundle = (IFacade) accessor.getBlock();
Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal());
if (facade != null) {
return facade.getPickBlock(pos, accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ);
//accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, bundle.getFacadeMetadata(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, 0), 0);
// TODO metadata is wrong, this gives the wrong output
ItemStack ret = facade.getPickBlock(pos, accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ);
//accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, 0, 0);
return ret;
}
}
} else if(accessor.getBlock() instanceof BlockDarkSteelAnvil) {
@@ -195,8 +199,12 @@ public class WailaCompat implements IWailaDataProvider {
return currenttip;
}
public static NBTTagCompound getNBTData()
{
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
return tag;
}
public static NBTTagCompound getNBTData() {
return _accessor.getNBTData();
}
}