From 88bc2b736a57f099dbbb8ea3aad14892e2847ab5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Mar 2019 22:26:14 -0600 Subject: [PATCH] Fix #2620 by syncing item ages to client --- .../subtile/functional/SubTileDaffomill.java | 14 ++++++ .../botania/common/network/PacketHandler.java | 1 + .../botania/common/network/PacketItemAge.java | 47 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/network/PacketItemAge.java diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 8cb36a7bf..244700f6f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -14,17 +14,22 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.network.PacketHandler; +import vazkii.botania.common.network.PacketItemAge; import java.util.List; @@ -158,4 +163,13 @@ public class SubTileDaffomill extends SubTileFunctional { windTicks = cmp.getInteger(TAG_WIND_TICKS); } + // Send item age to client to prevent client desync when an item is e.g. dropped by a powered open crate + @SubscribeEvent + public static void onItemTrack(PlayerEvent.StartTracking evt) { + if(evt.getTarget() instanceof EntityItem) { + int entityId = evt.getTarget().getEntityId(); + int age = ((EntityItem) evt.getTarget()).age; + PacketHandler.sendTo((EntityPlayerMP) evt.getEntityPlayer(), new PacketItemAge(entityId, age)); + } + } } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 838f50a63..91c1e4834 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -21,6 +21,7 @@ public final class PacketHandler { HANDLER.registerMessage(PacketLeftClick.Handler.class, PacketLeftClick.class, id++, Side.SERVER); HANDLER.registerMessage(PacketDodge.Handler.class, PacketDodge.class, id++, Side.SERVER); HANDLER.registerMessage(PacketJump.Handler.class, PacketJump.class, id++, Side.SERVER); + HANDLER.registerMessage(PacketItemAge.Handler.class, PacketItemAge.class, id++, Side.CLIENT); } /** diff --git a/src/main/java/vazkii/botania/common/network/PacketItemAge.java b/src/main/java/vazkii/botania/common/network/PacketItemAge.java new file mode 100644 index 000000000..8dc08cb13 --- /dev/null +++ b/src/main/java/vazkii/botania/common/network/PacketItemAge.java @@ -0,0 +1,47 @@ +package vazkii.botania.common.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; + +public class PacketItemAge implements IMessage { + private int entityId; + private int age; + + public PacketItemAge() {} + + public PacketItemAge(int entityId, int age) { + this.entityId = entityId; + this.age = age; + } + + @Override + public void fromBytes(ByteBuf buf) { + entityId = ByteBufUtils.readVarInt(buf, 5); + age = ByteBufUtils.readVarInt(buf, 5); + } + + @Override + public void toBytes(ByteBuf buf) { + ByteBufUtils.writeVarInt(buf, entityId, 5); + ByteBufUtils.writeVarInt(buf, age, 5); + } + + public static class Handler implements IMessageHandler { + @Override + public IMessage onMessage(PacketItemAge message, MessageContext ctx) { + Minecraft.getMinecraft().addScheduledTask(() -> { + Entity e = Minecraft.getMinecraft().world.getEntityByID(message.entityId); + if(e instanceof EntityItem) { + ((EntityItem) e).age = message.age; + } + }); + return null; + } + } +}