Merge remote-tracking branch 'refs/remotes/origin/Teleportation' into 1.10-WIP
# Conflicts: # src/main/java/com/zixiken/dimdoors/blocks/BlockDimDoorBase.java Removed a redundant method # src/main/java/com/zixiken/dimdoors/tileentities/DDTileEntityBase.java Imports going amok
This commit is contained in:
commit
30c86f1e16
18 changed files with 153 additions and 96 deletions
|
@ -3,8 +3,6 @@ package com.zixiken.dimdoors.blocks;
|
|||
import com.zixiken.dimdoors.items.ModItems;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class BlockDimDoor extends BlockDimDoorBase {
|
||||
|
||||
|
@ -18,10 +16,6 @@ public class BlockDimDoor extends BlockDimDoorBase {
|
|||
setRegistryName(ID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void placeLink(World world, BlockPos pos) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDoor() {
|
||||
return ModItems.itemDimDoor;
|
||||
|
|
|
@ -34,7 +34,20 @@ public abstract class BlockDimDoorBase extends BlockDoor implements IDimDoor, IT
|
|||
|
||||
@Override
|
||||
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) {
|
||||
enterDimDoor(world, pos, entity);
|
||||
IBlockState down = world.getBlockState(pos.down());
|
||||
if (!world.isRemote && down.getBlock() == this) {
|
||||
if (down.getValue(BlockDoor.OPEN)
|
||||
&& entity instanceof EntityPlayer
|
||||
&& isEntityFacingDoor(down, (EntityLivingBase) entity)) {
|
||||
this.toggleDoor(world, pos, false);
|
||||
enterDimDoor(world, pos, entity);
|
||||
}
|
||||
} else {
|
||||
BlockPos up = pos.up();
|
||||
if (world.getBlockState(up).getBlock() == this) {
|
||||
enterDimDoor(world, up, entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -110,20 +123,12 @@ public abstract class BlockDimDoorBase extends BlockDoor implements IDimDoor, IT
|
|||
|
||||
@Override
|
||||
public void enterDimDoor(World world, BlockPos pos, Entity entity) {
|
||||
// Check that this is the top block of the door
|
||||
IBlockState state = world.getBlockState(pos.down());
|
||||
if (!world.isRemote && state.getBlock() == this) {
|
||||
if (state.getValue(BlockDoor.OPEN)
|
||||
&& entity instanceof EntityPlayer
|
||||
&& isEntityFacingDoor(state, (EntityLivingBase) entity)) {
|
||||
this.toggleDoor(world, pos, false);
|
||||
//DimDoors.log("RiftID = " + getRiftTile(world, pos, world.getBlockState(pos)).riftID);
|
||||
}
|
||||
DDTileEntityBase riftTile = getRiftTile(world, pos, world.getBlockState(pos));
|
||||
if (riftTile.tryTeleport(entity)) {
|
||||
//player is succesfully teleported
|
||||
} else {
|
||||
BlockPos up = pos.up();
|
||||
if (world.getBlockState(up).getBlock() == this) {
|
||||
enterDimDoor(world, up, entity);
|
||||
}
|
||||
//@todo some kind of message that teleporting wasn't successfull
|
||||
//probably should only happen on personal dimdoors
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -155,10 +160,11 @@ public abstract class BlockDimDoorBase extends BlockDoor implements IDimDoor, IT
|
|||
world.setBlockState(pos, ModBlocks.blockRift.getDefaultState());
|
||||
DDTileEntityBase newRift = (DDTileEntityBase) world.getTileEntity(pos);
|
||||
newRift.loadDataFrom(origRift);
|
||||
DimDoors.log(this.getClass(), "New Rift rift-ID after breaking door " + newRift.riftID);
|
||||
DimDoors.log(this.getClass(), "New Rift rift-ID after breaking door " + newRift.getRiftID());
|
||||
}
|
||||
}
|
||||
|
||||
//returns the DDTileEntityBase that is the tile entity belonging to the door block "state" at this "pos" in the "world"
|
||||
public DDTileEntityBase getRiftTile(World world, BlockPos pos, IBlockState state) {
|
||||
TileEntity tileEntity;
|
||||
if (state.getValue(BlockDoor.HALF) == EnumDoorHalf.LOWER) {
|
||||
|
|
|
@ -2,11 +2,9 @@ package com.zixiken.dimdoors.blocks;
|
|||
|
||||
import com.zixiken.dimdoors.items.ModItems;
|
||||
import com.zixiken.dimdoors.tileentities.TileEntityDimDoorGold;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class BlockDimDoorGold extends BlockDimDoorBase {
|
||||
|
@ -20,10 +18,6 @@ public class BlockDimDoorGold extends BlockDimDoorBase {
|
|||
setRegistryName(ID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void placeLink(World world, BlockPos pos) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDoor() {
|
||||
return ModItems.itemDimDoorGold;
|
||||
|
|
|
@ -3,8 +3,6 @@ package com.zixiken.dimdoors.blocks;
|
|||
import com.zixiken.dimdoors.items.ModItems;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class BlockDimDoorPersonal extends BlockDimDoorBase {
|
||||
|
||||
|
@ -17,10 +15,6 @@ public class BlockDimDoorPersonal extends BlockDimDoorBase {
|
|||
setRegistryName(ID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void placeLink(World world, BlockPos pos) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDoor() {
|
||||
return ModItems.itemDimDoorPersonal;
|
||||
|
|
|
@ -6,7 +6,6 @@ import net.minecraft.entity.Entity;
|
|||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.EnumBlockRenderType;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
|
@ -40,10 +39,6 @@ public class BlockDimDoorTransient extends BlockDimDoorBase {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void placeLink(World world, BlockPos pos) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDoor() {
|
||||
return null;
|
||||
|
|
|
@ -1,14 +1,11 @@
|
|||
package com.zixiken.dimdoors.blocks;
|
||||
|
||||
import com.zixiken.dimdoors.items.ModItems;
|
||||
import java.util.Random;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockDimDoorUnstable extends BlockDimDoorBase {
|
||||
|
||||
|
@ -22,10 +19,6 @@ public class BlockDimDoorUnstable extends BlockDimDoorBase {
|
|||
setLightLevel(.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void placeLink(World world, BlockPos pos) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDoor() {
|
||||
return ModItems.itemDimDoorChaos;
|
||||
|
|
|
@ -3,8 +3,6 @@ package com.zixiken.dimdoors.blocks;
|
|||
import com.zixiken.dimdoors.items.ModItems;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class BlockDimDoorWarp extends BlockDimDoorBase {
|
||||
|
||||
|
@ -17,10 +15,6 @@ public class BlockDimDoorWarp extends BlockDimDoorBase {
|
|||
setRegistryName(ID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void placeLink(World world, BlockPos pos) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDoor() {
|
||||
return ModItems.itemDimDoorWarp;
|
||||
|
|
|
@ -3,6 +3,7 @@ package com.zixiken.dimdoors.blocks;
|
|||
import java.util.Random;
|
||||
|
||||
import com.zixiken.dimdoors.DimDoors;
|
||||
import com.zixiken.dimdoors.tileentities.TileEntityTransTrapdoor;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockTrapDoor;
|
||||
import net.minecraft.block.ITileEntityProvider;
|
||||
|
@ -20,7 +21,6 @@ import net.minecraft.util.EnumHand;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import com.zixiken.dimdoors.tileentities.TileEntityTransTrapdoor;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
|
@ -75,21 +75,11 @@ public class BlockTransTrapdoor extends BlockTrapDoor implements IDimDoor, ITile
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBlockAdded(World world, BlockPos pos, IBlockState state) {
|
||||
this.placeLink(world, pos);
|
||||
world.setTileEntity(pos, createNewTileEntity(world, getMetaFromState(state)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int metadata) {
|
||||
return new TileEntityTransTrapdoor();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void placeLink(World world, BlockPos pos) {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
|
||||
|
|
|
@ -2,7 +2,6 @@ package com.zixiken.dimdoors.blocks;
|
|||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
|
@ -20,16 +19,6 @@ public interface IDimDoor {
|
|||
*/
|
||||
public void enterDimDoor(World world, BlockPos pos, Entity entity);
|
||||
|
||||
/**
|
||||
* called when a door is placed to determine how it will place a link
|
||||
*
|
||||
* @param world
|
||||
* @param x
|
||||
* @param y
|
||||
* @param z
|
||||
*/
|
||||
public void placeLink(World world, BlockPos pos);
|
||||
|
||||
public Item getItemDoor();
|
||||
|
||||
/**
|
||||
|
|
|
@ -111,7 +111,7 @@ public abstract class ItemDoorBase extends ItemDoor {
|
|||
//start logging code
|
||||
if (possibleOldRift instanceof DDTileEntityBase) { //
|
||||
DDTileEntityBase oldRift = (DDTileEntityBase) possibleOldRift;
|
||||
DimDoors.log(this.getClass(), "Old Rift rift-ID before placement: " + oldRift.riftID);
|
||||
DimDoors.log(this.getClass(), "Old Rift rift-ID before placement: " + oldRift.getRiftID());
|
||||
}
|
||||
//end of logging code
|
||||
EnumFacing enumfacing = EnumFacing.fromAngle((double) playerIn.rotationYaw);
|
||||
|
@ -126,12 +126,12 @@ public abstract class ItemDoorBase extends ItemDoor {
|
|||
DDTileEntityBase newTileEntityDimDoor = (DDTileEntityBase) worldIn.getTileEntity(pos.up());
|
||||
if (possibleOldRift instanceof DDTileEntityBase) { //
|
||||
DDTileEntityBase oldRift = (DDTileEntityBase) possibleOldRift;
|
||||
DimDoors.log(this.getClass(), "Old Rift rift-ID after placement: " + oldRift.riftID);
|
||||
DimDoors.log(this.getClass(), "Old Rift rift-ID after placement: " + oldRift.getRiftID());
|
||||
newTileEntityDimDoor.loadDataFrom(oldRift);
|
||||
} else {
|
||||
newTileEntityDimDoor.register();
|
||||
}
|
||||
DimDoors.log(this.getClass(), "New Door rift-ID after placement: " + newTileEntityDimDoor.riftID);
|
||||
DimDoors.log(this.getClass(), "New Door rift-ID after placement: " + newTileEntityDimDoor.getRiftID());
|
||||
|
||||
return EnumActionResult.SUCCESS;
|
||||
} else {
|
||||
|
|
|
@ -61,12 +61,12 @@ public class ItemRiftConnectionTool extends ItemTool {
|
|||
}
|
||||
|
||||
private ActionResult<ItemStack> selectRift(ItemStack stack, World worldIn, DDTileEntityBase rift, EntityPlayer playerIn) {
|
||||
DimDoors.log(this.getClass(), "Selecting rift with ID: " + rift.riftID);
|
||||
DimDoors.log(this.getClass(), "Selecting rift with ID: " + rift.getRiftID());
|
||||
NBTTagCompound compound = stack.getTagCompound();
|
||||
if (compound.getBoolean("isInConnectMode")) {
|
||||
if (compound.hasKey("RiftID")) {
|
||||
int primaryRiftID = compound.getInteger("RiftID");
|
||||
int secondaryRiftID = rift.riftID;
|
||||
int secondaryRiftID = rift.getRiftID();
|
||||
if (!worldIn.isRemote) {
|
||||
DimDoors.log(this.getClass(), "Pairing rifts with IDs: " + primaryRiftID + " and " + secondaryRiftID);
|
||||
RiftRegistry.Instance.pair(primaryRiftID, secondaryRiftID);
|
||||
|
@ -74,11 +74,11 @@ public class ItemRiftConnectionTool extends ItemTool {
|
|||
compound.removeTag("RiftID");
|
||||
stack.damageItem(1, playerIn);
|
||||
} else {
|
||||
compound.setInteger("RiftID", rift.riftID);
|
||||
compound.setInteger("RiftID", rift.getRiftID());
|
||||
}
|
||||
} else {
|
||||
if (!worldIn.isRemote) {
|
||||
RiftRegistry.Instance.unpair(rift.riftID);
|
||||
RiftRegistry.Instance.unpair(rift.getRiftID());
|
||||
}
|
||||
stack.damageItem(1, playerIn);
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.zixiken.dimdoors.shared;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -13,25 +14,47 @@ import net.minecraftforge.common.DimensionManager;
|
|||
*/
|
||||
public class Location {
|
||||
|
||||
public int dimensionID;
|
||||
public BlockPos pos;
|
||||
private int dimensionID;
|
||||
private BlockPos pos;
|
||||
|
||||
Location(int dimID, int x, int y, int z) {
|
||||
this.dimensionID = dimID;
|
||||
pos = new BlockPos(x, y, z);
|
||||
public Location(World world, BlockPos pos) {
|
||||
this(world.provider.getDimension(), pos);
|
||||
}
|
||||
|
||||
Location(int dimID, BlockPos pos) {
|
||||
public Location(World world, int x, int y, int z) {
|
||||
this(world, new BlockPos(x,y,z));
|
||||
}
|
||||
|
||||
public Location(int dimID, int x, int y, int z) {
|
||||
this(dimID, new BlockPos(x, y, z));
|
||||
}
|
||||
|
||||
public Location(int dimID, BlockPos pos) {
|
||||
this.dimensionID = dimID;
|
||||
this.pos = pos.up(0); //copyOf
|
||||
}
|
||||
|
||||
public TileEntity getTileEntity() {
|
||||
World world = DimensionManager.getWorld(dimensionID); //@todo HOW?
|
||||
return world.getTileEntity(pos);
|
||||
return getWorld().getTileEntity(pos);
|
||||
}
|
||||
|
||||
static Location getLocation(TileEntity tileEntity) {
|
||||
public IBlockState getBlockState() {
|
||||
return getWorld().getBlockState(getPos());
|
||||
}
|
||||
|
||||
public BlockPos getPos() {
|
||||
return pos;
|
||||
}
|
||||
|
||||
public World getWorld() {
|
||||
return DimensionManager.getWorld(dimensionID);
|
||||
}
|
||||
|
||||
public int getDimensionID() {
|
||||
return dimensionID;
|
||||
}
|
||||
|
||||
static Location getLocation(TileEntity tileEntity) {//@todo Location is not yet comparable, so a Location begotten by this method, can not be used to find a rift ID in the RiftRegistry
|
||||
World world = tileEntity.getWorld();
|
||||
int dimID = world.provider.getDimension();
|
||||
BlockPos blockPos = tileEntity.getPos();
|
||||
|
|
|
@ -9,6 +9,7 @@ import com.zixiken.dimdoors.DimDoors;
|
|||
import com.zixiken.dimdoors.tileentities.DDTileEntityBase;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
@ -118,4 +119,8 @@ public class RiftRegistry {
|
|||
public DDTileEntityBase getLastChangedRift() {
|
||||
return lastBrokenRift;
|
||||
}
|
||||
|
||||
public void teleportEntityToRift(Entity entity, int pairedRiftID) {
|
||||
TeleportHelper.teleport(entity, getRiftLocation(pairedRiftID));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
package com.zixiken.dimdoors.shared;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.Teleporter;
|
||||
import net.minecraft.world.WorldServer;
|
||||
|
||||
public class TeleportHelper extends Teleporter {
|
||||
|
||||
Location location;
|
||||
|
||||
public TeleportHelper(Location location) {
|
||||
super((WorldServer) location.getWorld());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void placeInPortal(Entity entityIn, float rotationYaw) {
|
||||
BlockPos pos = location.getPos();
|
||||
entityIn.setPositionAndUpdate(pos.getX() + .5, pos.getY() + .05, pos.getZ() + .5);
|
||||
}
|
||||
|
||||
public static void teleport(Entity entity, Location location) {
|
||||
Teleporter tele = new TeleportHelper(location);
|
||||
if (entity instanceof EntityPlayerMP) {
|
||||
location.getWorld().getMinecraftServer().getPlayerList().transferPlayerToDimension((EntityPlayerMP) entity, location.getDimensionID(), tele);
|
||||
} else {
|
||||
location.getWorld().getMinecraftServer().getPlayerList().transferEntityToWorld(entity, entity.world.provider.getDimension(), (WorldServer) entity.world, (WorldServer) location.getWorld(), tele);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,9 +1,11 @@
|
|||
package com.zixiken.dimdoors.tileentities;
|
||||
|
||||
import com.zixiken.dimdoors.DimDoors;
|
||||
import com.zixiken.dimdoors.shared.Location;
|
||||
import com.zixiken.dimdoors.shared.RiftRegistry;
|
||||
import java.util.Random;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
@ -11,9 +13,9 @@ import net.minecraft.world.World;
|
|||
|
||||
public abstract class DDTileEntityBase extends TileEntity {
|
||||
|
||||
public boolean isPaired = false;
|
||||
public int riftID = -1; //should not start at 0
|
||||
public int pairedRiftID = -1;
|
||||
private boolean isPaired = false;
|
||||
private int riftID = -1; //should not start at 0
|
||||
private int pairedRiftID = -1;
|
||||
|
||||
public DDTileEntityBase() {
|
||||
super();
|
||||
|
@ -91,4 +93,22 @@ public abstract class DDTileEntityBase extends TileEntity {
|
|||
this.markDirty();
|
||||
}
|
||||
}
|
||||
|
||||
public int getRiftID() {
|
||||
return riftID;
|
||||
}
|
||||
|
||||
public int getPairedRiftID() {
|
||||
return pairedRiftID;
|
||||
}
|
||||
|
||||
public boolean isPaired() {
|
||||
return isPaired;
|
||||
}
|
||||
|
||||
public Location getTeleportTarget() {
|
||||
return new Location(this.getWorld().provider.getDimension(), this.getPos());
|
||||
}
|
||||
|
||||
public abstract boolean tryTeleport(Entity entity);
|
||||
}
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
package com.zixiken.dimdoors.tileentities;
|
||||
|
||||
import com.zixiken.dimdoors.shared.RiftRegistry;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
public class TileEntityDimDoor extends DDTileEntityBase {
|
||||
|
||||
public boolean openOrClosed;
|
||||
public EnumFacing orientation;
|
||||
public EnumFacing orientation = EnumFacing.SOUTH;
|
||||
public boolean hasExit;
|
||||
public byte lockStatus;
|
||||
public boolean isDungeonChainLink;
|
||||
|
@ -30,7 +31,7 @@ public class TileEntityDimDoor extends DDTileEntityBase {
|
|||
|
||||
@Override
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
|
||||
super.writeToNBT(nbt);
|
||||
super.writeToNBT(nbt);
|
||||
|
||||
nbt.setBoolean("openOrClosed", this.openOrClosed);
|
||||
nbt.setBoolean("hasExit", this.hasExit);
|
||||
|
@ -55,4 +56,20 @@ public class TileEntityDimDoor extends DDTileEntityBase {
|
|||
|
||||
return rgbaColor;
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public Location getTeleportTarget() {
|
||||
EnumFacing facing = getWorld().getBlockState(getPos()).getValue(BlockDimDoor.FACING);
|
||||
|
||||
return new Location(world, pos.offset(facing));
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public boolean tryTeleport(Entity entity) {
|
||||
if (!isPaired()) {
|
||||
//@todo try to automatically pair this door somehow
|
||||
}
|
||||
RiftRegistry.Instance.teleportEntityToRift(entity, getPairedRiftID());
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -142,4 +142,9 @@ public class TileEntityRift extends DDTileEntityBase implements ITickable {
|
|||
public float[] getRenderColor(Random rand) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean tryTeleport(Entity entity) {
|
||||
return false; //@todo, rift blade functionality?
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.zixiken.dimdoors.tileentities;
|
||||
|
||||
import java.util.Random;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
public class TileEntityTransTrapdoor extends DDTileEntityBase {
|
||||
|
||||
|
@ -18,4 +19,10 @@ public class TileEntityTransTrapdoor extends DDTileEntityBase {
|
|||
}
|
||||
return rgbaColor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean tryTeleport(Entity entity) {
|
||||
//@todo teleport the player somewhere to the Overworld?
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue