From eaa9c896840e9b994cd7f5bd40ffd5b6c0b6e917 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 21:42:53 -0500 Subject: [PATCH] Optimize spectator net traffic more - don't use nbt list of nbt longs just use nbt int array --- .../common/core/helper/MathHelper.java | 17 +++++++++++++++++ .../item/equipment/bauble/ItemItemFinder.java | 19 ++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index 66fe640e0..e2c92f72b 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -26,6 +26,23 @@ public final class MathHelper { return ret; } + public static int[] longArrayToIntArray(long[] longs) { + int[] ret = new int[longs.length * 2]; + for (int i = 0; i < longs.length; i++) { + ret[i] = (int) (longs[i] >>> 32); + ret[i + 1] = (int) longs[i]; + } + return ret; + } + + public static long[] intArrayToLongArray(int[] ints) { + long[] ret = new long[ints.length / 2]; + for (int i = 0; i < ints.length; i += 2) { + ret[i / 2] = ((long) ints[i]) << 32 | ints[i + 1]; + } + return ret; + } + public static double[] intArrayToDoubleArray(int[] ints) { double[] ret = new double[ints.length / 2]; for (int i = 0; i < ints.length; i += 2) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 6f0df1577..cd94c0bbd 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -29,6 +29,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagLong; import net.minecraft.tileentity.TileEntity; @@ -47,6 +48,7 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; import java.util.ArrayList; @@ -57,7 +59,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { private static final String TAG_POSITIONS_OLD = "highlightPositions"; private static final String TAG_ENTITY_POSITIONS = "highlightPositionsEnt"; - private static final String TAG_BLOCK_POSITIONS = "highlightPositionsBlock"; + private static final String TAG_BLOCK_POSITIONS = "highlightPositionsBlock1"; public ItemItemFinder() { super(LibItemNames.ITEM_FINDER); @@ -209,19 +211,14 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } private long[] getBlockPositions(ItemStack stack) { - NBTTagList list = ItemNBTHelper.getList(stack, TAG_BLOCK_POSITIONS, Constants.NBT.TAG_LONG, false); - long[] ret = new long[list.tagCount()]; - for (int i = 0; i < list.tagCount(); i++) { - ret[i] = ((NBTTagLong) list.get(i)).getLong(); - } - return ret; + int[] ints = ItemNBTHelper.getIntArray(stack, TAG_BLOCK_POSITIONS); + return MathHelper.intArrayToLongArray(ints); } private void setBlockPositions(ItemStack stack, long[] vals) { - NBTTagList list = new NBTTagList(); - for(long l : vals) - list.appendTag(new NBTTagLong(l)); - ItemNBTHelper.setList(stack, TAG_BLOCK_POSITIONS, list); + stack.getTagCompound().removeTag(TAG_BLOCK_POSITIONS); + int[] write = MathHelper.longArrayToIntArray(vals); + ItemNBTHelper.setIntArray(stack, TAG_BLOCK_POSITIONS, write); } @Override