lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Updated teleport logic (Untested) (0 errors)

Browse source
This commit is contained in:
WayofTime 2016-03-18 17:12:34 -04:00
parent 966f663270
commit 239b6e5b1f
2 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
View file

@ -7,6 +7,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -25,6 +26,9 @@ import WayofTime.bloodmagic.tile.TileDimensionalPortal;
public class BlockDimensionalPortal extends BlockIntegerContainer public class BlockDimensionalPortal extends BlockIntegerContainer
{ {
protected static final AxisAlignedBB AABB_0 = new AxisAlignedBB(0.0D, 0.0D, 0.375D, 1.0D, 1.0D, 0.625D);
protected static final AxisAlignedBB AABB_1 = new AxisAlignedBB(0.375D, 0.0D, 0.0D, 0.625D, 1.0D, 1.0D);
protected static final AxisAlignedBB AABB_DEFAULT = new AxisAlignedBB(0.375D, 0.0D, 0.375D, 0.625D, 1.0D, 0.625D);
public BlockDimensionalPortal() public BlockDimensionalPortal()
{ {
@ -80,20 +84,20 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
if (world.getTileEntity(tile.getMasterStonePos()) != null && world.getTileEntity(tile.getMasterStonePos()) instanceof IMasterRitualStone) if (world.getTileEntity(tile.getMasterStonePos()) != null && world.getTileEntity(tile.getMasterStonePos()) instanceof IMasterRitualStone)
{ {
IMasterRitualStone masterRitualStone = (IMasterRitualStone) world.getTileEntity(tile.getMasterStonePos()); IMasterRitualStone masterRitualStone = (IMasterRitualStone) world.getTileEntity(tile.getMasterStonePos());
if (linkedLocations.get(0).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimensionId()))) if (linkedLocations.get(0).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension())))
{ {
PortalLocation portal = linkedLocations.get(1); PortalLocation portal = linkedLocations.get(1);
if (portal.getDimension() == world.provider.getDimensionId()) if (portal.getDimension() == world.provider.getDimension())
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner())); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner()));
} else } else
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension())); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension()));
} }
} else if (linkedLocations.get(1).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimensionId()))) } else if (linkedLocations.get(1).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension())))
{ {
PortalLocation portal = linkedLocations.get(0); PortalLocation portal = linkedLocations.get(0);
if (portal.getDimension() == world.provider.getDimensionId()) if (portal.getDimension() == world.provider.getDimension())
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner())); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner()));
} else } else
@ -114,36 +118,38 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
} }
@Override @Override
public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos blockPos) public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{ {
int meta = world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)); int meta = state.getBlock().getMetaFromState(state);
if (meta == 0) if (meta == 0)
{ {
setBlockBounds(0f, 0f, 0.375f, 1f, 1f, 0.625f); return AABB_0;
} else if (meta == 1) } else if (meta == 1)
{ {
setBlockBounds(0.375f, 0f, 0f, 0.625f, 1f, 1f); return AABB_1;
} else } else
{ {
setBlockBounds(0f, 0f, 0f, 1f, 1, 1f); return AABB_DEFAULT;
} }
} }
@Override //
public void setBlockBoundsForItemRender() // @Override
{ // public void setBlockBoundsForItemRender()
setBlockBounds(0f, 0f, 0.375f, 1f, 1f, 0.625f); // {
} // setBlockBounds(0f, 0f, 0.375f, 1f, 1f, 0.625f);
// }
@Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public EnumWorldBlockLayer getBlockLayer() public BlockRenderLayer getBlockLayer()
{ {
return EnumWorldBlockLayer.TRANSLUCENT; return BlockRenderLayer.TRANSLUCENT;
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand) public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand)
{ {
this.spawnParticles(world, pos.getX(), pos.getY(), pos.getZ()); this.spawnParticles(world, pos.getX(), pos.getY(), pos.getZ());
} }
@ -157,27 +163,27 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
double particleX = (double) ((float) x + random.nextFloat()); double particleX = (double) ((float) x + random.nextFloat());
double particleY = (double) ((float) y + random.nextFloat()); double particleY = (double) ((float) y + random.nextFloat());
double particleZ = (double) ((float) z + random.nextFloat()); double particleZ = (double) ((float) z + random.nextFloat());
if (i == 0 && !world.getBlockState(new BlockPos(x, y + 1, z)).getBlock().isOpaqueCube()) if (i == 0 && !world.getBlockState(new BlockPos(x, y + 1, z)).isOpaqueCube())
{ {
particleY = (double) (y + 1) + d0; particleY = (double) (y + 1) + d0;
} }
if (i == 1 && !world.getBlockState(new BlockPos(x, y - 1, z)).getBlock().isOpaqueCube()) if (i == 1 && !world.getBlockState(new BlockPos(x, y - 1, z)).isOpaqueCube())
{ {
particleY = (double) y - d0; particleY = (double) y - d0;
} }
if (i == 2 && !world.getBlockState(new BlockPos(x, y, z + 1)).getBlock().isOpaqueCube()) if (i == 2 && !world.getBlockState(new BlockPos(x, y, z + 1)).isOpaqueCube())
{ {
particleZ = (double) (z + 1) + d0; particleZ = (double) (z + 1) + d0;
} }
if (i == 3 && !world.getBlockState(new BlockPos(x, y, z - 1)).getBlock().isOpaqueCube()) if (i == 3 && !world.getBlockState(new BlockPos(x, y, z - 1)).isOpaqueCube())
{ {
particleZ = (double) z - d0; particleZ = (double) z - d0;
} }
if (i == 4 && !world.getBlockState(new BlockPos(x + 1, y, z)).getBlock().isOpaqueCube()) if (i == 4 && !world.getBlockState(new BlockPos(x + 1, y, z)).isOpaqueCube())
{ {
particleX = (double) (x + 1) + d0; particleX = (double) (x + 1) + d0;
} }
if (i == 5 && !world.getBlockState(new BlockPos(x - 1, y, z)).getBlock().isOpaqueCube()) if (i == 5 && !world.getBlockState(new BlockPos(x - 1, y, z)).isOpaqueCube())
{ {
particleX = (double) x - d0; particleX = (double) x - d0;
} }

3
src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java
View file

@ -133,7 +133,8 @@ public class Teleports
} }
network.syphon(getTeleportCost()); network.syphon(getTeleportCost());
server.getConfigurationManager().transferPlayerToDimension(player, newWorldID, new TeleporterBloodMagic(newWorldServer)); player.changeDimension(newWorldID); //TODO: UNTESTED
// server.getConfigurationManager().transferPlayerToDimension(player, newWorldID, new TeleporterBloodMagic(newWorldServer));
player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5);
player.worldObj.updateEntityWithOptionalForce(player, false); player.worldObj.updateEntityWithOptionalForce(player, false);
player.playerNetServerHandler.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); player.playerNetServerHandler.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel()));