Revert change to new pick block method to keep compat with cauldron

This commit is contained in:
tterrag1098 committed 2015-02-05 01:58:36 -05:00
1 parent d09cf305fc
commit 4a782d1eff
2 files changed
+5 -3

No files matched your search

@@ -153,7 +153,7 @@ import static crazypants.enderio.EnderIO.MODID;
import static crazypants.enderio.EnderIO.MOD_NAME;
import static crazypants.enderio.EnderIO.VERSION;
@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:[email protected].2.1234,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:[email protected].0.1150,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
public class EnderIO {
public static final String MODID = "EnderIO";
@@ -118,6 +118,8 @@ public class WailaCompat implements IWailaDataProvider {
IWailaInfoProvider.fmt.setMaximumFractionDigits(1);
}
// IGNORE deprecation, the new method requires forge 1234 which is too new for cauldron!
@SuppressWarnings("deprecation")
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
MovingObjectPosition pos = accessor.getPosition();
@@ -126,13 +128,13 @@ 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) {
ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ, accessor.getPlayer());
ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ);
return ret;
}
}
} else if(accessor.getBlock() instanceof BlockDarkSteelAnvil) {
return accessor.getBlock().getPickBlock(accessor.getPosition(), accessor.getWorld(), accessor.getPosition().blockX, accessor.getPosition().blockY,
accessor.getPosition().blockZ, accessor.getPlayer());
accessor.getPosition().blockZ);
}
return null;