diff --git a/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java b/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java deleted file mode 100644 index 8f8652022..000000000 --- a/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * ****************************************************************************** - * Copyright 2011-2015 CovertJaguar - * - * This work (the API) is licensed under the "MIT" License, see LICENSE.md for details. - * *************************************************************************** - */ - -package mods.railcraft.api.core.items; - -import com.mojang.authlib.GameProfile; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * This interface should be implemented by any cart item, - * but it is generally optional. - * - * @author CovertJaguar - */ -public interface IMinecartItem -{ - - /** - * Controls whether this cart item can be placed by the Cart and Train Dispensers. - * - * Generally, you can ignore the placeCart() function if this returns false. - * - * @param cart - * @return true if it can be placed, false otherwise - */ - public boolean canBePlacedByNonPlayer(ItemStack cart); - - /** - * Places a cart at the specified location. - * - * Implementing this function is optional. - * - * @param owner the name of the player placing the cart or "[MyMod]" with the brackets - * @param cart An ItemStack that contains the cart - * @param world The World - * @param i x-Coord - * @param j y-Coord - * @param k z-Coord - * @return the cart placed or null if failed - */ - public EntityMinecart placeCart(GameProfile owner, ItemStack cart, World world, int i, int j, int k); -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index ed4a1d5ed..db63a97b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import com.mojang.authlib.GameProfile; -import mods.railcraft.api.core.items.IMinecartItem; import net.minecraft.block.BlockRailBase; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; @@ -21,14 +19,12 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.Optional; import vazkii.botania.common.entity.EntityPoolMinecart; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -@Optional.Interface(modid = "railcraft", iface = "mods.railcraft.api.core.items.IMinecartItem", striprefs = true) -public class ItemPoolMinecart extends ItemMod implements IMinecartItem { +public class ItemPoolMinecart extends ItemMod { public ItemPoolMinecart() { super(LibItemNames.POOL_MINECART); @@ -57,25 +53,4 @@ public class ItemPoolMinecart extends ItemMod implements IMinecartItem { return EnumActionResult.PASS; } - @Override - public boolean canBePlacedByNonPlayer(ItemStack cart) { - return true; - } - - @Override - public EntityMinecart placeCart(GameProfile owner, ItemStack cart, World world, int i, int j, int k) { - if(BlockRailBase.isRailBlock(world.getBlockState(new BlockPos(i, j, k)))) { - if(!world.isRemote) { - EntityMinecart entityminecart = new EntityPoolMinecart(world, i + 0.5,j + 0.5, k + 0.5); - - if(cart.hasDisplayName()) - entityminecart.setCustomNameTag(cart.getDisplayName()); - - if(world.spawnEntity(entityminecart)) - return entityminecart; - } - } - return null; - } - }