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 ddd6a6970..31115a457 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -14,43 +14,6 @@ import net.minecraft.entity.Entity; import vazkii.botania.api.internal.VanillaPacketDispatcher; public final class MathHelper { - - public static int[] doubleArrayToIntArray(double[] doubles) { - int[] ret = new int[doubles.length * 2]; - for (int i = 0; i < doubles.length; i++) { - long l = Double.doubleToLongBits(doubles[i]); - ret[i] = (int) (l >>> 32); - ret[i + 1] = (int) l; - } - 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) { - long l = (long) ints[i] << 32 | ints[i + 1]; - ret[i / 2] = Double.longBitsToDouble(l); - } - return ret; - } - public static float pointDistanceSpace(double x1, double y1, double z1, double x2, double y2, double z2) { return (float) Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2) + (z1 - z2) * (z1 - z2)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 1feedab6f..43c101001 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -156,7 +156,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub player.setSprinting(false); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, cooldown - 2); if(player instanceof EntityPlayerMP) - BotaniaAPI.internalHandler.sendBaubleUpdatePacket((EntityPlayerMP) player, 0); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket((EntityPlayerMP) player, 4); } } else if(!flying) { boolean doGlide = player.isSneaking() && !player.onGround && player.fallDistance >= 2F; 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 452d3a1fe..8cd11088e 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 @@ -17,7 +17,6 @@ import java.util.List; import baubles.api.BaubleType; import baubles.api.BaublesApi; import gnu.trove.list.array.TIntArrayList; -import gnu.trove.list.array.TLongArrayList; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -31,11 +30,14 @@ 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.NBTTagList; +import net.minecraft.nbt.NBTTagLong; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.village.MerchantRecipe; +import net.minecraftforge.common.util.Constants; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; @@ -47,12 +49,10 @@ 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; 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 = "highlightPositionsBlock1"; @@ -76,10 +76,11 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(!Botania.proxy.isTheClientPlayer(player)) return; - long[] blocks = getBlockPositions(stack); + NBTTagList blocks = ItemNBTHelper.getList(stack, TAG_BLOCK_POSITIONS, Constants.NBT.TAG_LONG, false); Botania.proxy.setWispFXDepthTest(false); - for(long l : blocks) { - BlockPos pos = BlockPos.fromLong(l); + + for(int i = 0; i < blocks.tagCount(); i++) { + BlockPos pos = BlockPos.fromLong(((NBTTagLong) blocks.get(i)).getLong()); float m = 0.02F; Botania.proxy.wispFX(pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5)); } @@ -97,29 +98,26 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } protected void tickServer(ItemStack stack, EntityPlayer player) { - ItemNBTHelper.removeEntry(stack, TAG_POSITIONS_OLD); - TIntArrayList entPosBuilder = new TIntArrayList(); - TLongArrayList blockPosBuilder = new TLongArrayList(); + NBTTagList blockPosBuilder = new NBTTagList(); scanForStack(player.getHeldItemMainhand(), player, entPosBuilder, blockPosBuilder); scanForStack(player.getHeldItemOffhand(), player, entPosBuilder, blockPosBuilder); int[] currentEnts = entPosBuilder.toArray(); - long[] currentBlocks = blockPosBuilder.toArray(); boolean entsEqual = Arrays.equals(currentEnts, ItemNBTHelper.getIntArray(stack, TAG_ENTITY_POSITIONS)); - boolean blocksEqual = Arrays.equals(currentBlocks, getBlockPositions(stack)); + boolean blocksEqual = blockPosBuilder.equals(ItemNBTHelper.getList(stack, TAG_BLOCK_POSITIONS, Constants.NBT.TAG_LONG, false)); if(!entsEqual) ItemNBTHelper.setIntArray(stack, TAG_ENTITY_POSITIONS, currentEnts); if(!blocksEqual) - setBlockPositions(stack, currentBlocks); + ItemNBTHelper.setList(stack, TAG_BLOCK_POSITIONS, blockPosBuilder); if(!entsEqual || !blocksEqual) - BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, 0); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, 4); } - private void scanForStack(ItemStack pstack, EntityPlayer player, TIntArrayList entIdBuilder, TLongArrayList blockPosBuilder) { + private void scanForStack(ItemStack pstack, EntityPlayer player, TIntArrayList entIdBuilder, NBTTagList blockPosBuilder) { if(pstack != null || player.isSneaking()) { int range = 24; @@ -172,7 +170,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { for(EnumFacing e : EnumFacing.VALUES) { if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e) && scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) { - blockPosBuilder.add(pos_.toLong()); + blockPosBuilder.appendTag(new NBTTagLong(pos_.toLong())); foundCap = true; break; } @@ -180,7 +178,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(!foundCap && tile instanceof IInventory) { IInventory inv = (IInventory) tile; if(scanInventory(new InvWrapper(inv), pstack)) - blockPosBuilder.add(pos_.toLong()); + blockPosBuilder.appendTag(new NBTTagLong(pos_.toLong())); } } } @@ -205,17 +203,6 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { return false; } - private long[] getBlockPositions(ItemStack stack) { - int[] ints = ItemNBTHelper.getIntArray(stack, TAG_BLOCK_POSITIONS); - return MathHelper.intArrayToLongArray(ints); - } - - private void setBlockPositions(ItemStack stack, long[] vals) { - stack.getTagCompound().removeTag(TAG_BLOCK_POSITIONS); - int[] write = MathHelper.longArrayToIntArray(vals); - ItemNBTHelper.setIntArray(stack, TAG_BLOCK_POSITIONS, write); - } - @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.HEAD; diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 891803f2e..580ceb1cb 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -40,10 +40,6 @@ public class PacketBotaniaEffect implements IMessage { this.args = args; } - public PacketBotaniaEffect(EffectType type, double x, double y, double z, double... args) { - this(type, x, y, z, MathHelper.doubleArrayToIntArray(args)); - } - @Override public void fromBytes(ByteBuf buf) { type = EffectType.values()[buf.readShort()];