Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed error with computer craft api change

Browse source
This commit is contained in:
DarkGuardsman 2013-07-14 10:54:43 -04:00
parent 9ce878400a
commit 9baa621c94
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -87,7 +87,7 @@ public class AssemblyLine
@Metadata(AssemblyLine.MOD_ID) @Metadata(AssemblyLine.MOD_ID)
public static ModMetadata meta; 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 DIRECTORY = "/" + DIRECTORY_NO_SLASH;
public static final String LANGUAGE_PATH = DIRECTORY + "languages/"; public static final String LANGUAGE_PATH = DIRECTORY + "languages/";
public static final String SOUND_PATH = DIRECTORY + "audio/"; 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" }; 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; public static int BLOCK_ID_PREFIX = 3030;

3
src/minecraft/assemblyline/common/armbot/TileEntityArmbot.java
View file

@ -38,6 +38,7 @@ import assemblyline.common.machine.encoder.ItemDisk;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
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.ILuaContext;
import dan200.computer.api.IPeripheral; import dan200.computer.api.IPeripheral;
import dark.helpers.ItemFindingHelper; import dark.helpers.ItemFindingHelper;
import dark.library.machine.IMultiBlock; import dark.library.machine.IMultiBlock;
@ -615,7 +616,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
} }
@Override @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) switch (method)
{ {

13
src/minecraft/assemblyline/common/imprinter/ItemImprinter.java
View file

@ -6,6 +6,7 @@ import java.util.List;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IProjectile; import net.minecraft.entity.IProjectile;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -26,7 +27,7 @@ public class ItemImprinter extends Item
this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setCreativeTab(TabAssemblyLine.INSTANCE);
this.setHasSubtypes(true); this.setHasSubtypes(true);
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
@ -53,6 +54,12 @@ public class ItemImprinter extends Item
return false; return false;
} }
public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLiving)
{
return false;
}
@Override @Override
public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) 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<ItemStack> filterStacks) public static void setFilters(ItemStack itemStack, ArrayList<ItemStack> filterStacks)
{ {
if (itemStack.getTagCompound() == null) if (itemStack.getTagCompound() == null)