diff --git a/gradle.properties b/gradle.properties index 9ab39ab2..d234f982 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ mod_version=2.2.3 #mod_appendix=beta buildcraft_version=6.1.5 -waila_version=1.5.5_1.7.10 +waila_version=1.5.6a_1.7.10 ae2_version=rv1-stable-1 ttCore_version=MC1.7.10-0.0.3-33 diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index e64e97bf..f92151c7 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -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; diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 6816765f..fc719259 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -219,6 +219,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { if(conduitsDirty) { if(!worldObj.isRemote) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + markDirty(); } conduitsDirty = false; } diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 2aaf1d0e..ff27335b 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -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(); } }