Move getPlayer from ProxyCommon to PlayerUtil

This commit is contained in:
mezz committed 2015-10-22 14:10:26 -07:00
1 parent 84968c6021
commit 02c25142cd
9 files changed
+41 -35

No files matched your search

@@ -41,13 +41,13 @@ import forestry.core.inventory.TileInventoryAdapter;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.GuiId;
import forestry.core.proxy.Proxies;
import forestry.core.render.TankRenderInfo;
import forestry.core.tiles.IItemStackDisplay;
import forestry.core.tiles.ILiquidTankTile;
import forestry.core.tiles.TilePowered;
import forestry.core.utils.InventoryUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.PlayerUtil;
import forestry.core.utils.SlotUtil;
import forestry.factory.recipes.CarpenterRecipeManager;
@@ -298,7 +298,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
}
private boolean removeSets(int count, ItemStack[] set) {
EntityPlayer player = Proxies.common.getPlayer(worldObj, getAccessHandler().getOwner());
EntityPlayer player = PlayerUtil.getPlayer(worldObj, getAccessHandler().getOwner());
return InventoryUtil.removeSets(getInternalInventory(), count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true);
}
@@ -44,12 +44,12 @@ import forestry.core.inventory.TileInventoryAdapter;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.GuiId;
import forestry.core.proxy.Proxies;
import forestry.core.render.TankRenderInfo;
import forestry.core.tiles.ILiquidTankTile;
import forestry.core.tiles.TilePowered;
import forestry.core.utils.InventoryUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.PlayerUtil;
import forestry.factory.recipes.SqueezerRecipeManager;
public class TileSqueezer extends TilePowered implements ISocketable, ISidedInventory, ILiquidTankTile, ISpeedUpgradable {
@@ -140,7 +140,7 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
@Override
public boolean workCycle() {
EntityPlayer player = Proxies.common.getPlayer(worldObj, getAccessHandler().getOwner());
EntityPlayer player = PlayerUtil.getPlayer(worldObj, getAccessHandler().getOwner());
if (!inventory.removeResources(currentRecipe.getResources(), player)) {
return false;
}