correct errors caused by forge version change
This commit is contained in:
parent
5676d27dc2
commit
741d2e1bf4
11 changed files with 18 additions and 18 deletions
|
@ -37,7 +37,7 @@ public class BlockALMachine extends BlockAdvanced
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
public Icon getIcon(int par1, int par2)
|
||||||
{
|
{
|
||||||
return this.machine_icon;
|
return this.machine_icon;
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class BlockCrate extends BlockALMachine
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int side, int metadata)
|
public Icon getIcon(int side, int metadata)
|
||||||
{
|
{
|
||||||
return this.crate_icon;
|
return this.crate_icon;
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class BlockTurntable extends BlockALMachine
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
|
public Icon getIcon(int side, int meta)
|
||||||
{
|
{
|
||||||
if (side == ForgeDirection.UP.ordinal())
|
if (side == ForgeDirection.UP.ordinal())
|
||||||
return this.top;
|
return this.top;
|
||||||
|
|
|
@ -49,7 +49,7 @@ import cpw.mods.fml.common.FMLLog;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import dan200.computer.api.IComputerAccess;
|
import dan200.computer.api.IComputerAccess;
|
||||||
import dan200.computer.api.IPeripheral;
|
import dan200.computer.api.IPeripheral;
|
||||||
import dark.minecraft.helpers.ItemWorldHelper;
|
import dark.helpers.ItemFindingHelper;
|
||||||
|
|
||||||
public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMultiBlock, IInventory, IPacketReceiver, IElectricityStorage, IArmbot, IPeripheral
|
public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMultiBlock, IInventory, IPacketReceiver, IElectricityStorage, IArmbot, IPeripheral
|
||||||
{
|
{
|
||||||
|
@ -924,7 +924,7 @@ public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMult
|
||||||
|
|
||||||
while (it.hasNext())
|
while (it.hasNext())
|
||||||
{
|
{
|
||||||
ItemWorldHelper.dropItemStackExact(worldObj, handPosition.x, handPosition.y, handPosition.z, it.next());
|
ItemFindingHelper.dropItemStackExact(worldObj, handPosition.x, handPosition.y, handPosition.z, it.next());
|
||||||
}
|
}
|
||||||
|
|
||||||
this.grabbedEntities.clear();
|
this.grabbedEntities.clear();
|
||||||
|
|
|
@ -6,7 +6,7 @@ import net.minecraft.block.Block;
|
||||||
import net.minecraft.entity.item.EntityItem;
|
import net.minecraft.entity.item.EntityItem;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import universalelectricity.core.vector.Vector3;
|
import universalelectricity.core.vector.Vector3;
|
||||||
import dark.minecraft.helpers.ItemWorldHelper;
|
import dark.helpers.ItemFindingHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used by arms to break a specific block in a position.
|
* Used by arms to break a specific block in a position.
|
||||||
|
@ -35,7 +35,7 @@ public class CommandBreak extends Command
|
||||||
|
|
||||||
if (!this.keep || items.size() > 1)
|
if (!this.keep || items.size() > 1)
|
||||||
{
|
{
|
||||||
ItemWorldHelper.dropBlockAsItem(this.world, serachPosition.intX(), serachPosition.intY(), serachPosition.intZ());
|
ItemFindingHelper.dropBlockAsItem(this.world, serachPosition.intX(), serachPosition.intY(), serachPosition.intZ());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import universalelectricity.core.vector.Vector3;
|
import universalelectricity.core.vector.Vector3;
|
||||||
import dark.minecraft.helpers.ItemWorldHelper;
|
import dark.helpers.ItemFindingHelper;
|
||||||
|
|
||||||
public class CommandPowerTo extends Command
|
public class CommandPowerTo extends Command
|
||||||
{
|
{
|
||||||
|
@ -57,7 +57,7 @@ public class CommandPowerTo extends Command
|
||||||
List<ItemStack> stacks = new ArrayList<ItemStack>();
|
List<ItemStack> stacks = new ArrayList<ItemStack>();
|
||||||
stacks.add(new ItemStack(Block.torchRedstoneActive, 1, 0));
|
stacks.add(new ItemStack(Block.torchRedstoneActive, 1, 0));
|
||||||
stacks.add(new ItemStack(Block.torchRedstoneIdle, 1, 0));
|
stacks.add(new ItemStack(Block.torchRedstoneIdle, 1, 0));
|
||||||
if (ItemWorldHelper.filterItems(this.tileEntity.getGrabbedItems(), stacks).size() > 0)
|
if (ItemFindingHelper.filterItems(this.tileEntity.getGrabbedItems(), stacks).size() > 0)
|
||||||
{
|
{
|
||||||
this.powerBlock(true);
|
this.powerBlock(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,7 @@ public class BlockDetector extends BlockImprintable
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int side, int metadata)
|
public Icon getIcon(int side, int metadata)
|
||||||
{
|
{
|
||||||
if (side == ForgeDirection.SOUTH.ordinal())
|
if (side == ForgeDirection.SOUTH.ordinal())
|
||||||
{
|
{
|
||||||
|
|
|
@ -41,14 +41,14 @@ public class BlockEncoder extends BlockALMachine
|
||||||
@Override
|
@Override
|
||||||
public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
|
public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
|
||||||
{
|
{
|
||||||
return getBlockTextureFromSideAndMetadata(side, 0);
|
return getIcon(side, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the block texture based on the side being looked at. Args: side
|
* Returns the block texture based on the side being looked at. Args: side
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
|
public Icon getIcon(int side, int meta)
|
||||||
{
|
{
|
||||||
if (side == 1)
|
if (side == 1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,9 +26,9 @@ public class ItemDisk extends Item
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public void updateIcons(IconRegister par1IconRegister)
|
public void registerIcons(IconRegister par1IconRegister)
|
||||||
{
|
{
|
||||||
this.iconIndex = par1IconRegister.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "disk");
|
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "disk");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -45,14 +45,14 @@ public class BlockImprinter extends BlockALMachine
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
|
public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
|
||||||
{
|
{
|
||||||
return getBlockTextureFromSideAndMetadata(side, 0);
|
return getIcon(side, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the block texture based on the side being looked at. Args: side
|
* Returns the block texture based on the side being looked at. Args: side
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
|
public Icon getIcon(int side, int meta)
|
||||||
{
|
{
|
||||||
if (side == 1)
|
if (side == 1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,9 +29,9 @@ public class ItemImprinter extends Item
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public void updateIcons(IconRegister par1IconRegister)
|
public void registerIcons(IconRegister par1IconRegister)
|
||||||
{
|
{
|
||||||
this.iconIndex = par1IconRegister.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "imprint");
|
this.itemIcon = par1IconRegister.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "imprint");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in a new issue