From 741d2e1bf4847ee07ac85af8e3ea475407470cb9 Mon Sep 17 00:00:00 2001 From: Robert Seifert Date: Sat, 20 Apr 2013 07:41:03 -0400 Subject: [PATCH] correct errors caused by forge version change --- src/minecraft/assemblyline/common/block/BlockALMachine.java | 2 +- src/minecraft/assemblyline/common/block/BlockCrate.java | 2 +- src/minecraft/assemblyline/common/block/BlockTurntable.java | 2 +- .../assemblyline/common/machine/armbot/TileEntityArmbot.java | 4 ++-- .../assemblyline/common/machine/command/CommandBreak.java | 4 ++-- .../assemblyline/common/machine/command/CommandPowerTo.java | 4 ++-- .../assemblyline/common/machine/detector/BlockDetector.java | 2 +- .../assemblyline/common/machine/encoder/BlockEncoder.java | 4 ++-- .../assemblyline/common/machine/encoder/ItemDisk.java | 4 ++-- .../assemblyline/common/machine/imprinter/BlockImprinter.java | 4 ++-- .../assemblyline/common/machine/imprinter/ItemImprinter.java | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/minecraft/assemblyline/common/block/BlockALMachine.java b/src/minecraft/assemblyline/common/block/BlockALMachine.java index cc75b13c..c30405d8 100644 --- a/src/minecraft/assemblyline/common/block/BlockALMachine.java +++ b/src/minecraft/assemblyline/common/block/BlockALMachine.java @@ -37,7 +37,7 @@ public class BlockALMachine extends BlockAdvanced @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) + public Icon getIcon(int par1, int par2) { return this.machine_icon; } diff --git a/src/minecraft/assemblyline/common/block/BlockCrate.java b/src/minecraft/assemblyline/common/block/BlockCrate.java index 80c14c29..4408a8be 100644 --- a/src/minecraft/assemblyline/common/block/BlockCrate.java +++ b/src/minecraft/assemblyline/common/block/BlockCrate.java @@ -51,7 +51,7 @@ public class BlockCrate extends BlockALMachine } @Override - public Icon getBlockTextureFromSideAndMetadata(int side, int metadata) + public Icon getIcon(int side, int metadata) { return this.crate_icon; } diff --git a/src/minecraft/assemblyline/common/block/BlockTurntable.java b/src/minecraft/assemblyline/common/block/BlockTurntable.java index 32415cf5..1f032d01 100644 --- a/src/minecraft/assemblyline/common/block/BlockTurntable.java +++ b/src/minecraft/assemblyline/common/block/BlockTurntable.java @@ -57,7 +57,7 @@ public class BlockTurntable extends BlockALMachine @Override @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int side, int meta) + public Icon getIcon(int side, int meta) { if (side == ForgeDirection.UP.ordinal()) return this.top; diff --git a/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java b/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java index 1a397a69..a8abcf34 100644 --- a/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java +++ b/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java @@ -49,7 +49,7 @@ import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.relauncher.Side; import dan200.computer.api.IComputerAccess; 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 { @@ -924,7 +924,7 @@ public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMult 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(); diff --git a/src/minecraft/assemblyline/common/machine/command/CommandBreak.java b/src/minecraft/assemblyline/common/machine/command/CommandBreak.java index f5f41d2a..bc05dce1 100644 --- a/src/minecraft/assemblyline/common/machine/command/CommandBreak.java +++ b/src/minecraft/assemblyline/common/machine/command/CommandBreak.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; 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. @@ -35,7 +35,7 @@ public class CommandBreak extends Command 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 { diff --git a/src/minecraft/assemblyline/common/machine/command/CommandPowerTo.java b/src/minecraft/assemblyline/common/machine/command/CommandPowerTo.java index 3542f0bb..eaeb28e0 100644 --- a/src/minecraft/assemblyline/common/machine/command/CommandPowerTo.java +++ b/src/minecraft/assemblyline/common/machine/command/CommandPowerTo.java @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; -import dark.minecraft.helpers.ItemWorldHelper; +import dark.helpers.ItemFindingHelper; public class CommandPowerTo extends Command { @@ -57,7 +57,7 @@ public class CommandPowerTo extends Command List stacks = new ArrayList(); stacks.add(new ItemStack(Block.torchRedstoneActive, 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); } diff --git a/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java b/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java index 9b3d7ac0..484a0d90 100644 --- a/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java +++ b/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java @@ -97,7 +97,7 @@ public class BlockDetector extends BlockImprintable } @Override - public Icon getBlockTextureFromSideAndMetadata(int side, int metadata) + public Icon getIcon(int side, int metadata) { if (side == ForgeDirection.SOUTH.ordinal()) { diff --git a/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java index 07b4f968..c2183bde 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java +++ b/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java @@ -41,14 +41,14 @@ public class BlockEncoder extends BlockALMachine @Override 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 */ @Override - public Icon getBlockTextureFromSideAndMetadata(int side, int meta) + public Icon getIcon(int side, int meta) { if (side == 1) { diff --git a/src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java b/src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java index 712fab0a..2a235279 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java +++ b/src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java @@ -26,9 +26,9 @@ public class ItemDisk extends Item @Override @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 diff --git a/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java b/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java index 7f77de71..3272599a 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java @@ -45,14 +45,14 @@ public class BlockImprinter extends BlockALMachine @SideOnly(Side.CLIENT) 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 */ @Override - public Icon getBlockTextureFromSideAndMetadata(int side, int meta) + public Icon getIcon(int side, int meta) { if (side == 1) { diff --git a/src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java b/src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java index 9fe333ac..6c5a255c 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java @@ -29,9 +29,9 @@ public class ItemImprinter extends Item @Override @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