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

Teleposition Sigil should make sure a Teleposer is the destination (#1328)

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-06-26 17:09:18 -07:00
parent 86f54886c5
commit 22e8290921
1 changed files with 90 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java
View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.item.sigil; package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.data.Binding;
import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.iface.ISigil;
import WayofTime.bloodmagic.teleport.TeleportQueue; import WayofTime.bloodmagic.teleport.TeleportQueue;
import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.util.helper.NBTHelper;
@ -12,18 +12,23 @@ import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.util.INBTSerializable;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.List; import java.util.List;
public class ItemSigilTeleposition extends ItemSigilBase { public class ItemSigilTeleposition extends ItemSigilBase {
public ItemSigilTeleposition() { public ItemSigilTeleposition() {
super("teleposition"); super("teleposition");
} }
@ -33,14 +38,11 @@ public class ItemSigilTeleposition extends ItemSigilBase {
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) { public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
super.addInformation(stack, world, tooltip, flag); super.addInformation(stack, world, tooltip, flag);
if (!stack.hasTagCompound()) TeleportLocation location = getTeleportLocation(stack);
return; if (location != null) {
NBTTagCompound tag = stack.getTagCompound(); tooltip.add("");
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", location.pos.getX(), location.pos.getY(), location.pos.getZ()));
if (tag != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) { tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.dimension", location.dim));
tooltip.add(" ");
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.coords", getValue(tag, Constants.NBT.X_COORD), getValue(tag, Constants.NBT.Y_COORD), getValue(tag, Constants.NBT.Z_COORD)));
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.telepositionFocus.dimension", getValue(tag, Constants.NBT.DIMENSION_ID)));
} }
} }
@ -52,15 +54,23 @@ public class ItemSigilTeleposition extends ItemSigilBase {
if (PlayerHelper.isFakePlayer(player)) if (PlayerHelper.isFakePlayer(player))
return ActionResult.newResult(EnumActionResult.FAIL, stack); return ActionResult.newResult(EnumActionResult.FAIL, stack);
if (!world.isRemote && NBTHelper.checkNBT(stack) != null && stack.getTagCompound().hasKey(Constants.NBT.DIMENSION_ID) && stack.getTagCompound().hasKey(Constants.NBT.X_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Y_COORD) && stack.getTagCompound().hasKey(Constants.NBT.Z_COORD)) { TeleportLocation location = getTeleportLocation(stack);
BlockPos blockPos = new BlockPos(getValue(stack.getTagCompound(), Constants.NBT.X_COORD), getValue(stack.getTagCompound(), Constants.NBT.Y_COORD), getValue(stack.getTagCompound(), Constants.NBT.Z_COORD)).up(); Binding binding = getBinding(stack);
if (world.provider.getDimension() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID)) { if (!world.isRemote && location != null && binding != null) {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getBinding(stack).getOwnerId(), true)); World teleportTo = DimensionManager.getWorld(location.dim);
if (teleportTo != null) {
TileEntity tile = teleportTo.getTileEntity(location.pos);
if (tile instanceof TileTeleposer) {
BlockPos blockPos = location.pos.up();
if (world.provider.getDimension() == location.dim) {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, binding.getOwnerId(), true));
}
// FIXME - Fix cross-dimension teleports causing major desync
// } else {
// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true));
// }
}
} }
// FIXME - Fix cross-dimension teleports causing major desync
// } else {
// TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true));
// }
} }
return super.onItemRightClick(world, player, hand); return super.onItemRightClick(world, player, hand);
} }
@ -75,18 +85,74 @@ public class ItemSigilTeleposition extends ItemSigilBase {
if (!world.isRemote && player.isSneaking() && NBTHelper.checkNBT(stack) != null) { if (!world.isRemote && player.isSneaking() && NBTHelper.checkNBT(stack) != null) {
if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileTeleposer) { if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileTeleposer) {
stack.getTagCompound().setInteger(Constants.NBT.DIMENSION_ID, world.provider.getDimension()); TeleportLocation teleportLocation = new TeleportLocation(world.provider.getDimension(), pos);
stack.getTagCompound().setInteger(Constants.NBT.X_COORD, pos.getX()); updateLocation(stack, teleportLocation);
stack.getTagCompound().setInteger(Constants.NBT.Y_COORD, pos.getY());
stack.getTagCompound().setInteger(Constants.NBT.Z_COORD, pos.getZ());
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
} }
return EnumActionResult.FAIL; return EnumActionResult.FAIL;
} }
public int getValue(NBTTagCompound tag, String key) { @Nullable
return tag.getInteger(key); public TeleportLocation getTeleportLocation(ItemStack stack) {
if (!(stack.getItem() instanceof ItemSigilTeleposition))
return null;
if (!stack.hasTagCompound())
return null;
NBTTagCompound locationTag = stack.getSubCompound("tplocation");
if (locationTag == null)
return null;
return TeleportLocation.fromTag(locationTag);
}
public void updateLocation(ItemStack stack, TeleportLocation location) {
NBTTagCompound tagCompound;
if (!stack.hasTagCompound())
stack.setTagCompound(tagCompound = new NBTTagCompound());
else
tagCompound = stack.getTagCompound();
tagCompound.setTag("tplocation", location.serializeNBT());
}
public static class TeleportLocation implements INBTSerializable<NBTTagCompound> {
private int dim;
private BlockPos pos;
private TeleportLocation() {
}
public TeleportLocation(int dim, BlockPos pos) {
this.dim = dim;
this.pos = pos;
}
public TeleportLocation(int dim, int x, int y, int z) {
this(dim, new BlockPos(x, y, z));
}
@Override
public NBTTagCompound serializeNBT() {
NBTTagCompound tag = new NBTTagCompound();
tag.setInteger("dim", dim);
tag.setLong("pos", pos.toLong());
return tag;
}
@Override
public void deserializeNBT(NBTTagCompound nbt) {
this.dim = nbt.getInteger("dim");
this.pos = BlockPos.fromLong(nbt.getLong("pos"));
}
public static TeleportLocation fromTag(NBTTagCompound tpTag) {
TeleportLocation location = new TeleportLocation();
location.deserializeNBT(tpTag);
return location;
}
} }
} }