From 146e30cbda73f3890978e2bd852fa91dfb620c9f Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Wed, 17 Dec 2014 01:20:37 +0100 Subject: [PATCH] Added player and world to getNBTData for entities. --- .../addons/stevescarts/HUDMinecartModular.java | 3 ++- .../mobius/waila/api/IWailaEntityProvider.java | 3 ++- .../waila/handlers/HUDHandlerEntities.java | 3 ++- .../waila/network/Message0x03EntRequest.java | 17 +++++++++++++++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java index ab26faf..df55f41 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.stevescarts; import java.util.List; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -85,7 +86,7 @@ public class HUDMinecartModular implements IWailaEntityProvider { } @Override - public NBTTagCompound getNBTData(Entity te, NBTTagCompound tag) { + public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) { if (te != null) te.writeToNBT(tag); return tag; diff --git a/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java index 32f6efd..c73822b 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.api; import java.util.List; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -22,5 +23,5 @@ public interface IWailaEntityProvider { * NBTTagCompound tag argument is the current NBT tag passed along by the various providers (first provider will be empty). * You HAVE TO return it if you registered as a provider, even if you are not doing anything to it (similar to the tooltip lists). * */ - NBTTagCompound getNBTData(Entity ent, NBTTagCompound tag); + NBTTagCompound getNBTData(EntityPlayerMP player, Entity ent, NBTTagCompound tag, World world); } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java index be9a2ea..98a22a3 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; @@ -98,7 +99,7 @@ public class HUDHandlerEntities implements IWailaEntityProvider { } @Override - public NBTTagCompound getNBTData(Entity te, NBTTagCompound tag) { + public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) { return tag; } diff --git a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java index 6178d69..43b5528 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java @@ -1,16 +1,20 @@ package mcp.mobius.waila.network; +import java.lang.reflect.Method; import java.util.HashMap; import java.util.HashSet; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.NetworkRegistry; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaEntityProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.utils.NBTUtil; import mcp.mobius.waila.utils.WailaExceptionHandler; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -72,9 +76,18 @@ public class Message0x03EntRequest extends SimpleChannelInboundHandler