mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-20 12:19:44 +00:00
Entity tooltip is now handled by the API (registration, lookup, etc).
TODO : Add icon handling and overriding.
This commit is contained in:
1 parent
5a8673d322
commit
d2c6d95e75
9 files changed
+258
-55
No files matched your search
+2
-2
@@ -15,7 +15,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import mcp.mobius.waila.api.IWailaDataAccessor;
|
||||
|
||||
public class DataAccessor implements IWailaDataAccessor {
|
||||
public class DataAccessorBlock implements IWailaDataAccessor {
|
||||
|
||||
public World world;
|
||||
public EntityPlayer player;
|
||||
@@ -29,7 +29,7 @@ public class DataAccessor implements IWailaDataAccessor {
|
||||
public long timeLastUpdate = System.currentTimeMillis();
|
||||
public double partialFrame;
|
||||
|
||||
public static DataAccessor instance = new DataAccessor();
|
||||
public static DataAccessorBlock instance = new DataAccessorBlock();
|
||||
|
||||
public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) {
|
||||
this.set(_world, _player, _mop, null, 0.0);
|
||||
@@ -0,0 +1,121 @@
|
||||
package mcp.mobius.waila.api.impl;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagByte;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagInt;
|
||||
import net.minecraft.nbt.NBTTagShort;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.World;
|
||||
import mcp.mobius.waila.api.IWailaEntityAccessor;
|
||||
|
||||
public class DataAccessorEntity implements IWailaEntityAccessor {
|
||||
|
||||
public World world;
|
||||
public EntityPlayer player;
|
||||
public MovingObjectPosition mop;
|
||||
public Vec3 renderingvec = null;
|
||||
public Entity entity;
|
||||
public NBTTagCompound remoteNbt = null;
|
||||
public long timeLastUpdate = System.currentTimeMillis();
|
||||
public double partialFrame;
|
||||
|
||||
public static DataAccessorEntity instance = new DataAccessorEntity();
|
||||
|
||||
public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) {
|
||||
this.set(_world, _player, _mop, null, 0.0);
|
||||
}
|
||||
|
||||
public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, EntityLivingBase viewEntity, double partialTicks) {
|
||||
this.world = _world;
|
||||
this.player = _player;
|
||||
this.mop = _mop;
|
||||
this.entity = _mop.entityHit;
|
||||
|
||||
if (viewEntity != null){
|
||||
double px = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks;
|
||||
double py = viewEntity.lastTickPosY + (viewEntity.posY - viewEntity.lastTickPosY) * partialTicks;
|
||||
double pz = viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks;
|
||||
this.renderingvec = Vec3.createVectorHelper(_mop.blockX - px, _mop.blockY - py, _mop.blockZ - pz);
|
||||
this.partialFrame = partialTicks;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public World getWorld() {
|
||||
return this.world;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityPlayer getPlayer() {
|
||||
return this.player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Entity getEntity() {
|
||||
return this.entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MovingObjectPosition getPosition() {
|
||||
return this.mop;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getNBTData() {
|
||||
if (this.entity == null) return null;
|
||||
|
||||
if (this.isTagCorrect(this.remoteNbt))
|
||||
return this.remoteNbt;
|
||||
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
this.entity.writeToNBT(tag);
|
||||
return tag;
|
||||
}
|
||||
|
||||
private boolean isTagCorrect(NBTTagCompound tag){
|
||||
if (tag == null){
|
||||
this.timeLastUpdate = System.currentTimeMillis() - 250;
|
||||
return false;
|
||||
}
|
||||
|
||||
int x = tag.getInteger("x");
|
||||
int y = tag.getInteger("y");
|
||||
int z = tag.getInteger("z");
|
||||
|
||||
if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ)
|
||||
return true;
|
||||
else {
|
||||
this.timeLastUpdate = System.currentTimeMillis() - 250;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getNBTInteger(NBTTagCompound tag, String keyname){
|
||||
NBTBase subtag = tag.getTag(keyname);
|
||||
if (subtag instanceof NBTTagInt)
|
||||
return tag.getInteger(keyname);
|
||||
if (subtag instanceof NBTTagShort)
|
||||
return tag.getShort(keyname);
|
||||
if (subtag instanceof NBTTagByte)
|
||||
return tag.getByte(keyname);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Vec3 getRenderingPosition() {
|
||||
return this.renderingvec;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getPartialFrame() {
|
||||
return this.partialFrame;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -7,8 +7,11 @@ import mcp.mobius.waila.WailaExceptionHandler;
|
||||
import mcp.mobius.waila.mod_Waila;
|
||||
import mcp.mobius.waila.api.IWailaBlock;
|
||||
import mcp.mobius.waila.api.IWailaDataProvider;
|
||||
import mcp.mobius.waila.api.IWailaEntityAccessor;
|
||||
import mcp.mobius.waila.api.IWailaEntityProvider;
|
||||
import mcp.mobius.waila.network.Packet0x01TERequest;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -19,13 +22,18 @@ import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
|
||||
public class MetaDataProvider{
|
||||
|
||||
private ArrayList<IWailaDataProvider> headProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> bodyProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> tailProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> headBlockProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> bodyBlockProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> tailBlockProviders = new ArrayList<IWailaDataProvider>();
|
||||
|
||||
private ArrayList<IWailaEntityProvider> headEntityProviders = new ArrayList<IWailaEntityProvider>();
|
||||
private ArrayList<IWailaEntityProvider> bodyEntityProviders = new ArrayList<IWailaEntityProvider>();
|
||||
private ArrayList<IWailaEntityProvider> tailEntityProviders = new ArrayList<IWailaEntityProvider>();
|
||||
|
||||
private Class prevBlock = null;
|
||||
private Class prevTile = null;
|
||||
|
||||
public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessor accessor) {
|
||||
public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorBlock accessor) {
|
||||
Block block = accessor.getBlock();
|
||||
int blockID = accessor.getBlockID();
|
||||
|
||||
@@ -51,7 +59,7 @@ public class MetaDataProvider{
|
||||
return null;
|
||||
}
|
||||
|
||||
public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessor accessor, List<String> currenttip, Layout layout) {
|
||||
public List<String> handleBlockTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorBlock accessor, List<String> currenttip, Layout layout) {
|
||||
Block block = accessor.getBlock();
|
||||
int blockID = accessor.getBlockID();
|
||||
|
||||
@@ -84,34 +92,34 @@ public class MetaDataProvider{
|
||||
}
|
||||
}
|
||||
|
||||
headProviders.clear();
|
||||
bodyProviders.clear();
|
||||
tailProviders.clear();
|
||||
headBlockProviders.clear();
|
||||
bodyBlockProviders.clear();
|
||||
tailBlockProviders.clear();
|
||||
|
||||
/* Lookup by class (for blocks)*/
|
||||
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block))
|
||||
headProviders.addAll(ModuleRegistrar.instance().getHeadProviders(block));
|
||||
headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(block));
|
||||
|
||||
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block))
|
||||
bodyProviders.addAll(ModuleRegistrar.instance().getBodyProviders(block));
|
||||
bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(block));
|
||||
|
||||
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block))
|
||||
tailProviders.addAll(ModuleRegistrar.instance().getTailProviders(block));
|
||||
tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(block));
|
||||
|
||||
|
||||
/* Lookup by class (for tileentities)*/
|
||||
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity()))
|
||||
headProviders.addAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
|
||||
headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
|
||||
|
||||
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity()))
|
||||
bodyProviders.addAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
|
||||
bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
|
||||
|
||||
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity()))
|
||||
tailProviders.addAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
|
||||
tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
|
||||
|
||||
/* Apply all collected providers */
|
||||
if (layout == Layout.HEADER)
|
||||
for (IWailaDataProvider dataProvider : headProviders)
|
||||
for (IWailaDataProvider dataProvider : headBlockProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
@@ -119,7 +127,7 @@ public class MetaDataProvider{
|
||||
}
|
||||
|
||||
if (layout == Layout.BODY)
|
||||
for (IWailaDataProvider dataProvider : bodyProviders)
|
||||
for (IWailaDataProvider dataProvider : bodyBlockProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
@@ -127,7 +135,7 @@ public class MetaDataProvider{
|
||||
}
|
||||
|
||||
if (layout == Layout.FOOTER)
|
||||
for (IWailaDataProvider dataProvider : tailProviders)
|
||||
for (IWailaDataProvider dataProvider : tailBlockProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
@@ -136,4 +144,59 @@ public class MetaDataProvider{
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
public List<String> handleEntityTextData(Entity entity, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorEntity accessor, List<String> currenttip, Layout layout) {
|
||||
|
||||
/*
|
||||
Block block = accessor.getBlock();
|
||||
int blockID = accessor.getBlockID();
|
||||
|
||||
if (accessor.getTileEntity() != null && mod_Waila.instance.serverPresent &&
|
||||
((System.currentTimeMillis() - accessor.timeLastUpdate >= 250))){
|
||||
accessor.timeLastUpdate = System.currentTimeMillis();
|
||||
PacketDispatcher.sendPacketToServer(Packet0x01TERequest.create(world, mop));
|
||||
}
|
||||
*/
|
||||
|
||||
headEntityProviders.clear();
|
||||
bodyEntityProviders.clear();
|
||||
tailEntityProviders.clear();
|
||||
|
||||
/* Lookup by class (for entities)*/
|
||||
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadEntityProviders(entity))
|
||||
headEntityProviders.addAll(ModuleRegistrar.instance().getHeadEntityProviders(entity));
|
||||
|
||||
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity))
|
||||
bodyEntityProviders.addAll(ModuleRegistrar.instance().getBodyEntityProviders(entity));
|
||||
|
||||
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity))
|
||||
tailEntityProviders.addAll(ModuleRegistrar.instance().getTailEntityProviders(entity));
|
||||
|
||||
/* Apply all collected providers */
|
||||
if (layout == Layout.HEADER)
|
||||
for (IWailaEntityProvider dataProvider : headEntityProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaHead(entity, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
if (layout == Layout.BODY)
|
||||
for (IWailaEntityProvider dataProvider : bodyEntityProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaBody(entity, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
if (layout == Layout.FOOTER)
|
||||
for (IWailaEntityProvider dataProvider : tailEntityProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
import mcp.mobius.waila.WailaExceptionHandler;
|
||||
import mcp.mobius.waila.api.IWailaBlockDecorator;
|
||||
import mcp.mobius.waila.api.impl.ConfigHandler;
|
||||
import mcp.mobius.waila.api.impl.DataAccessor;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorBlock;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import mcp.mobius.waila.overlay.RayTracing;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -30,7 +30,7 @@ public class WailaClientEventHandler {
|
||||
|
||||
double partialTicks = event.partialTicks;
|
||||
|
||||
DataAccessor accessor = DataAccessor.instance;
|
||||
DataAccessorBlock accessor = DataAccessorBlock.instance;
|
||||
World world = Minecraft.getMinecraft().theWorld;
|
||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||
EntityLivingBase viewEntity = Minecraft.getMinecraft().renderViewEntity;
|
||||
|
||||
@@ -2,6 +2,9 @@ package mcp.mobius.waila.handlers;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.ModContainer;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.Icon;
|
||||
import mcp.mobius.waila.api.IWailaConfigHandler;
|
||||
@@ -22,6 +25,11 @@ public class HUDHandlerEntities implements IWailaEntityProvider {
|
||||
|
||||
@Override
|
||||
public List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
|
||||
try{
|
||||
currenttip.add("\u00a7f" + entity.getEntityName());
|
||||
} catch (Exception e){
|
||||
currenttip.add("\u00a7f" + "Unknown");
|
||||
}
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@@ -32,7 +40,24 @@ public class HUDHandlerEntities implements IWailaEntityProvider {
|
||||
|
||||
@Override
|
||||
public List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
|
||||
try{
|
||||
currenttip.add("\u00a79\u00a7o" + getEntityMod(entity));
|
||||
} catch (Exception e){
|
||||
currenttip.add("\u00a79\u00a7o" + "Unknown");
|
||||
}
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
private static String getEntityMod(Entity entity){
|
||||
String modName = "";
|
||||
try{
|
||||
EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), true);
|
||||
ModContainer modC = er.getContainer();
|
||||
modName = modC.getName();
|
||||
} catch (NullPointerException e){
|
||||
modName = "Minecraft";
|
||||
}
|
||||
return modName;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,7 +6,7 @@ import java.io.IOException;
|
||||
|
||||
import mcp.mobius.waila.WailaExceptionHandler;
|
||||
import mcp.mobius.waila.mod_Waila;
|
||||
import mcp.mobius.waila.api.impl.DataAccessor;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorBlock;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.INetworkManager;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
@@ -47,7 +47,7 @@ public class WailaPacketHandler implements IPacketHandler {
|
||||
}
|
||||
else if (header == 0x02){
|
||||
Packet0x02TENBTData castedPacket = new Packet0x02TENBTData(packet);
|
||||
DataAccessor.instance.remoteNbt = castedPacket.tag;
|
||||
DataAccessorBlock.instance.remoteNbt = castedPacket.tag;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ import java.awt.Point;
|
||||
import mcp.mobius.waila.Constants;
|
||||
import mcp.mobius.waila.mod_Waila;
|
||||
import mcp.mobius.waila.api.impl.ConfigHandler;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorEntity;
|
||||
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
@@ -49,33 +50,10 @@ public class OverlayRenderer {
|
||||
|
||||
if (RayTracing.instance().getTarget().typeOfHit == EnumMovingObjectType.ENTITY)
|
||||
{
|
||||
Entity ent = RayTracing.instance().getTarget().entityHit;
|
||||
String modName = getEntityMod(ent);
|
||||
|
||||
List<String> textData = new ArrayList<String>();
|
||||
try{
|
||||
textData.add("\u00a7f" + ent.getEntityName());
|
||||
} catch (Exception e){
|
||||
textData.add("\u00a7f" + "Unknown");
|
||||
}
|
||||
textData.add("\u00a79\u00a7o" + modName);
|
||||
|
||||
renderOverlay(ent, textData, getPositioning());
|
||||
renderOverlay(DataAccessorEntity.instance.getEntity(), WailaTickHandler.instance().currenttip, getPositioning()); // Might need change for the override
|
||||
}
|
||||
}
|
||||
|
||||
private static String getEntityMod(Entity entity){
|
||||
String modName = "";
|
||||
try{
|
||||
EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), true);
|
||||
ModContainer modC = er.getContainer();
|
||||
modName = modC.getName();
|
||||
} catch (NullPointerException e){
|
||||
modName = "Minecraft";
|
||||
}
|
||||
return modName;
|
||||
}
|
||||
|
||||
private static Point getPositioning()
|
||||
{
|
||||
return new Point(ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSX), ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSY));
|
||||
|
||||
@@ -6,7 +6,7 @@ import java.util.Comparator;
|
||||
|
||||
import mcp.mobius.waila.Constants;
|
||||
import mcp.mobius.waila.api.impl.ConfigHandler;
|
||||
import mcp.mobius.waila.api.impl.DataAccessor;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorBlock;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -126,7 +126,7 @@ public class RayTracing {
|
||||
*/
|
||||
|
||||
if (ModuleRegistrar.instance().hasStackProviders(mouseoverBlock))
|
||||
items.add(ModuleRegistrar.instance().getStackProviders(mouseoverBlock).get(0).getWailaStack(DataAccessor.instance, ConfigHandler.instance()));
|
||||
items.add(ModuleRegistrar.instance().getStackProviders(mouseoverBlock).get(0).getWailaStack(DataAccessorBlock.instance, ConfigHandler.instance()));
|
||||
|
||||
if(items.size() > 0)
|
||||
return items;
|
||||
|
||||
@@ -4,10 +4,12 @@ import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
|
||||
import mcp.mobius.waila.api.impl.DataAccessor;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorBlock;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorEntity;
|
||||
import mcp.mobius.waila.api.impl.MetaDataProvider;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemBlockWithMetadata;
|
||||
@@ -56,17 +58,31 @@ public class WailaTickHandler implements ITickHandler {
|
||||
MovingObjectPosition target = RayTracing.instance().getTarget();
|
||||
|
||||
if (target != null && target.typeOfHit == EnumMovingObjectType.TILE){
|
||||
DataAccessor accessor = DataAccessor.instance;
|
||||
DataAccessorBlock accessor = DataAccessorBlock.instance;
|
||||
accessor.set(world, player, target);
|
||||
ItemStack targetStack = RayTracing.instance().getTargetStack();
|
||||
ItemStack targetStack = RayTracing.instance().getTargetStack(); // Here we get either the proper stack or the override
|
||||
|
||||
if (targetStack != null){
|
||||
this.currenttip.clear();
|
||||
|
||||
//this.identifiedHighlight = handler.identifyHighlight(world, player, target);
|
||||
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.HEADER);
|
||||
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.BODY);
|
||||
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.FOOTER);
|
||||
this.currenttip = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttip, Layout.HEADER);
|
||||
this.currenttip = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttip, Layout.BODY);
|
||||
this.currenttip = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttip, Layout.FOOTER);
|
||||
}
|
||||
}
|
||||
else if (target != null && target.typeOfHit == EnumMovingObjectType.ENTITY){
|
||||
DataAccessorEntity accessor = DataAccessorEntity.instance;
|
||||
accessor.set(world, player, target);
|
||||
|
||||
Entity targetEnt = accessor.getEntity(); // This need to be replaced by the override check.
|
||||
|
||||
if (targetEnt != null){
|
||||
this.currenttip.clear();
|
||||
|
||||
this.currenttip = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttip, Layout.HEADER);
|
||||
this.currenttip = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttip, Layout.BODY);
|
||||
this.currenttip = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttip, Layout.FOOTER);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user