From 9baa621c941d075721791529744410c30a22183f Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Sun, 14 Jul 2013 10:54:43 -0400 Subject: [PATCH] fixed error with computer craft api change --- src/minecraft/assemblyline/common/AssemblyLine.java | 4 ++-- .../common/armbot/TileEntityArmbot.java | 3 ++- .../common/imprinter/ItemImprinter.java | 13 +++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index 1b4033e3..f392a4d1 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -87,7 +87,7 @@ public class AssemblyLine @Metadata(AssemblyLine.MOD_ID) public static ModMetadata meta; - public static final String DIRECTORY_NO_SLASH = "assets/al/"; + public static final String DIRECTORY_NO_SLASH = "assets/" + DOMAIN + "/"; public static final String DIRECTORY = "/" + DIRECTORY_NO_SLASH; public static final String LANGUAGE_PATH = DIRECTORY + "languages/"; public static final String SOUND_PATH = DIRECTORY + "audio/"; @@ -102,7 +102,7 @@ public class AssemblyLine private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US", "nl_NL", "fr_FR", "de_DE" }; - public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "UniversalElectricity/AssemblyLine.cfg")); + public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "Dark/AssemblyLine.cfg")); public static int BLOCK_ID_PREFIX = 3030; diff --git a/src/minecraft/assemblyline/common/armbot/TileEntityArmbot.java b/src/minecraft/assemblyline/common/armbot/TileEntityArmbot.java index 62ca75ae..bc0c0ee3 100644 --- a/src/minecraft/assemblyline/common/armbot/TileEntityArmbot.java +++ b/src/minecraft/assemblyline/common/armbot/TileEntityArmbot.java @@ -38,6 +38,7 @@ import assemblyline.common.machine.encoder.ItemDisk; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import dan200.computer.api.IComputerAccess; +import dan200.computer.api.ILuaContext; import dan200.computer.api.IPeripheral; import dark.helpers.ItemFindingHelper; import dark.library.machine.IMultiBlock; @@ -615,7 +616,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, } @Override - public Object[] callMethod(IComputerAccess computer, int method, Object[] arguments) throws Exception + public Object[] callMethod( IComputerAccess computer, ILuaContext context, int method, Object[] arguments ) throws Exception { switch (method) { diff --git a/src/minecraft/assemblyline/common/imprinter/ItemImprinter.java b/src/minecraft/assemblyline/common/imprinter/ItemImprinter.java index 782fb47f..aefe5ae2 100644 --- a/src/minecraft/assemblyline/common/imprinter/ItemImprinter.java +++ b/src/minecraft/assemblyline/common/imprinter/ItemImprinter.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,7 +27,7 @@ public class ItemImprinter extends Item this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setHasSubtypes(true); } - + @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) @@ -53,6 +54,12 @@ public class ItemImprinter extends Item return false; } + + public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLiving) + { + return false; + } + @Override public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { @@ -71,9 +78,7 @@ public class ItemImprinter extends Item } } - /** - * Saves the list of items to filter out inside. - */ + /** Saves the list of items to filter out inside. */ public static void setFilters(ItemStack itemStack, ArrayList filterStacks) { if (itemStack.getTagCompound() == null)