mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-18 11:29:06 +00:00
Moved string gather to CLIENT tick for caching.
This commit is contained in:
1 parent
a49d359656
commit
b1f7f2f2df
6 files changed
+125
-112
No files matched your search
@@ -73,43 +73,49 @@ public class ExternalModulesHandler implements IWailaRegistrar {
|
||||
|
||||
@Override
|
||||
public void registerHeadProvider(IWailaDataProvider dataProvider, int blockID) {
|
||||
if (!this.headProviders.containsKey(blockID))
|
||||
this.headProviders.put(blockID, new ArrayList<IWailaDataProvider>());
|
||||
this.headProviders.get(blockID).add(dataProvider);
|
||||
this.registerHeadProvider(dataProvider, Block.blocksList[blockID].getClass());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerHeadProvider(IWailaDataProvider dataProvider, Class block) {
|
||||
if (!this.headBlockProviders.containsKey(block))
|
||||
this.headBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
|
||||
|
||||
ArrayList<IWailaDataProvider> providers = this.headBlockProviders.get(block);
|
||||
if (providers.contains(dataProvider)) return;
|
||||
|
||||
this.headBlockProviders.get(block).add(dataProvider);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerBodyProvider(IWailaDataProvider dataProvider, int blockID) {
|
||||
if (!this.bodyProviders.containsKey(blockID))
|
||||
this.bodyProviders.put(blockID, new ArrayList<IWailaDataProvider>());
|
||||
this.bodyProviders.get(blockID).add(dataProvider);
|
||||
this.registerBodyProvider(dataProvider, Block.blocksList[blockID].getClass());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerBodyProvider(IWailaDataProvider dataProvider, Class block) {
|
||||
if (!this.bodyBlockProviders.containsKey(block))
|
||||
this.bodyBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
|
||||
|
||||
ArrayList<IWailaDataProvider> providers = this.bodyBlockProviders.get(block);
|
||||
if (providers.contains(dataProvider)) return;
|
||||
|
||||
this.bodyBlockProviders.get(block).add(dataProvider);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerTailProvider(IWailaDataProvider dataProvider, int blockID) {
|
||||
if (!this.tailProviders.containsKey(blockID))
|
||||
this.tailProviders.put(blockID, new ArrayList<IWailaDataProvider>());
|
||||
this.tailProviders.get(blockID).add(dataProvider);
|
||||
this.registerTailProvider(dataProvider, Block.blocksList[blockID].getClass());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerTailProvider(IWailaDataProvider dataProvider, Class block) {
|
||||
if (!this.tailBlockProviders.containsKey(block))
|
||||
this.tailBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
|
||||
|
||||
ArrayList<IWailaDataProvider> providers = this.tailBlockProviders.get(block);
|
||||
if (providers.contains(dataProvider)) return;
|
||||
|
||||
this.tailBlockProviders.get(block).add(dataProvider);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package mcp.mobius.waila.client;
|
||||
|
||||
import mcp.mobius.waila.Constants;
|
||||
import mcp.mobius.waila.mod_Waila;
|
||||
import mcp.mobius.waila.addons.ExternalModulesHandler;
|
||||
import mcp.mobius.waila.addons.appeng.AppEngModule;
|
||||
import mcp.mobius.waila.addons.buildcraft.BCModule;
|
||||
@@ -22,6 +23,7 @@ import mcp.mobius.waila.gui.truetyper.FontLoader;
|
||||
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
|
||||
import mcp.mobius.waila.handlers.SummaryProviderDefault;
|
||||
import mcp.mobius.waila.handlers.hud.HUDHandlerExternal;
|
||||
import mcp.mobius.waila.handlers.hud.HUDHandlerNEI;
|
||||
import mcp.mobius.waila.handlers.hud.HUDHandlerWaila;
|
||||
import mcp.mobius.waila.handlers.tooltip.TooltipHandlerWaila;
|
||||
import mcp.mobius.waila.overlay.WailaTickHandler;
|
||||
@@ -59,8 +61,11 @@ public class ProxyClient extends ProxyServer {
|
||||
TickRegistry.registerTickHandler(WailaTickHandler.instance(), Side.CLIENT);
|
||||
|
||||
GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila());
|
||||
API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.HEADER);
|
||||
API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.BODY);
|
||||
|
||||
//API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.HEADER);
|
||||
//API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.BODY);
|
||||
API.registerHighlightHandler(new HUDHandlerNEI(), ItemInfo.Layout.HEADER);
|
||||
API.registerHighlightHandler(new HUDHandlerNEI(), ItemInfo.Layout.BODY);
|
||||
API.registerHighlightHandler(new HUDHandlerWaila(), ItemInfo.Layout.FOOTER);
|
||||
API.registerHighlightHandler(new HUDHandlerWaila(), ItemInfo.Layout.HEADER);
|
||||
|
||||
|
||||
@@ -28,18 +28,8 @@ public class HUDHandlerExternal implements IHighlightHandler {
|
||||
private ArrayList<IWailaDataProvider> headProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> bodyProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> tailProviders = new ArrayList<IWailaDataProvider>();
|
||||
private MovingObjectPosition prevMOP = null;
|
||||
private int prevWorldID = -999;
|
||||
|
||||
/*
|
||||
private static HUDHandlerExternal _instance;
|
||||
private HUDHandlerExternal(){}
|
||||
public static HUDHandlerExternal instance(){
|
||||
if(_instance == null)
|
||||
_instance = new HUDHandlerExternal();
|
||||
return _instance;
|
||||
}
|
||||
*/
|
||||
private Class prevBlock = null;
|
||||
private Class prevTile = null;
|
||||
|
||||
@Override
|
||||
public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) {
|
||||
@@ -72,21 +62,19 @@ public class HUDHandlerExternal implements IHighlightHandler {
|
||||
|
||||
@Override
|
||||
public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, List<String> currenttip, Layout layout) {
|
||||
if (this.prevMOP == null)
|
||||
this.prevMOP = new MovingObjectPosition(Minecraft.getMinecraft().thePlayer);
|
||||
|
||||
DataAccessor accessor = DataAccessor.instance;
|
||||
accessor.set(world, player, mop);
|
||||
Block block = accessor.getBlock();
|
||||
int blockID = accessor.getBlockID();
|
||||
|
||||
if (accessor.getTileEntity() != null && mod_Waila.instance.serverPresent &&
|
||||
((System.currentTimeMillis() - accessor.timeLastUpdate >= 250) || this.areMopDifferent(player, mop))){
|
||||
((System.currentTimeMillis() - accessor.timeLastUpdate >= 250))){
|
||||
accessor.timeLastUpdate = System.currentTimeMillis();
|
||||
PacketDispatcher.sendPacketToServer(Packet0x01TERequest.create(world, mop));
|
||||
}
|
||||
|
||||
/* Interface IWailaBlock */
|
||||
/*
|
||||
if (IWailaBlock.class.isInstance(block)){
|
||||
TileEntity entity = world.getBlockTileEntity(mop.blockX, mop.blockY, mop.blockZ);
|
||||
if (layout == Layout.HEADER)
|
||||
@@ -108,76 +96,58 @@ public class HUDHandlerExternal implements IHighlightHandler {
|
||||
return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip);
|
||||
}
|
||||
}
|
||||
|
||||
if (this.areMopDifferent(player, mop)){
|
||||
*/
|
||||
|
||||
headProviders.clear();
|
||||
bodyProviders.clear();
|
||||
tailProviders.clear();
|
||||
|
||||
this.prevMOP = mop;
|
||||
this.prevWorldID = player.dimension;
|
||||
|
||||
/* Lookup by block ID */
|
||||
if (layout == Layout.HEADER && ExternalModulesHandler.instance().hasHeadProviders(blockID))
|
||||
headProviders.addAll(ExternalModulesHandler.instance().getHeadProviders(blockID));
|
||||
|
||||
if (layout == Layout.BODY && ExternalModulesHandler.instance().hasBodyProviders(blockID))
|
||||
bodyProviders.addAll(ExternalModulesHandler.instance().getBodyProviders(blockID));
|
||||
|
||||
if (layout == Layout.FOOTER && ExternalModulesHandler.instance().hasTailProviders(blockID))
|
||||
tailProviders.addAll(ExternalModulesHandler.instance().getTailProviders(blockID));
|
||||
|
||||
|
||||
/* Lookup by class (for blocks)*/
|
||||
if (layout == Layout.HEADER && ExternalModulesHandler.instance().hasHeadProviders(block))
|
||||
headProviders.addAll(ExternalModulesHandler.instance().getHeadProviders(block));
|
||||
|
||||
if (layout == Layout.BODY && ExternalModulesHandler.instance().hasBodyProviders(block))
|
||||
bodyProviders.addAll(ExternalModulesHandler.instance().getBodyProviders(block));
|
||||
|
||||
if (layout == Layout.FOOTER && ExternalModulesHandler.instance().hasTailProviders(block))
|
||||
tailProviders.addAll(ExternalModulesHandler.instance().getTailProviders(block));
|
||||
|
||||
|
||||
/* Lookup by class (for tileentities)*/
|
||||
if (layout == Layout.HEADER && ExternalModulesHandler.instance().hasHeadProviders(accessor.getTileEntity()))
|
||||
headProviders.addAll(ExternalModulesHandler.instance().getHeadProviders(accessor.getTileEntity()));
|
||||
|
||||
if (layout == Layout.BODY && ExternalModulesHandler.instance().hasBodyProviders(accessor.getTileEntity()))
|
||||
bodyProviders.addAll(ExternalModulesHandler.instance().getBodyProviders(accessor.getTileEntity()));
|
||||
headProviders.clear();
|
||||
bodyProviders.clear();
|
||||
tailProviders.clear();
|
||||
|
||||
if (layout == Layout.FOOTER && ExternalModulesHandler.instance().hasTailProviders(accessor.getTileEntity()))
|
||||
tailProviders.addAll(ExternalModulesHandler.instance().getTailProviders(accessor.getTileEntity()));
|
||||
|
||||
}
|
||||
|
||||
/* Apply all collected providers */
|
||||
for (IWailaDataProvider dataProvider : headProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
/* Lookup by class (for blocks)*/
|
||||
if (layout == Layout.HEADER && ExternalModulesHandler.instance().hasHeadProviders(block))
|
||||
headProviders.addAll(ExternalModulesHandler.instance().getHeadProviders(block));
|
||||
|
||||
else if (layout == Layout.BODY && ExternalModulesHandler.instance().hasBodyProviders(block))
|
||||
bodyProviders.addAll(ExternalModulesHandler.instance().getBodyProviders(block));
|
||||
|
||||
else if (layout == Layout.FOOTER && ExternalModulesHandler.instance().hasTailProviders(block))
|
||||
tailProviders.addAll(ExternalModulesHandler.instance().getTailProviders(block));
|
||||
|
||||
for (IWailaDataProvider dataProvider : bodyProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
for (IWailaDataProvider dataProvider : tailProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
/* Lookup by class (for tileentities)*/
|
||||
if (layout == Layout.HEADER && ExternalModulesHandler.instance().hasHeadProviders(accessor.getTileEntity()))
|
||||
headProviders.addAll(ExternalModulesHandler.instance().getHeadProviders(accessor.getTileEntity()));
|
||||
|
||||
else if (layout == Layout.BODY && ExternalModulesHandler.instance().hasBodyProviders(accessor.getTileEntity()))
|
||||
bodyProviders.addAll(ExternalModulesHandler.instance().getBodyProviders(accessor.getTileEntity()));
|
||||
|
||||
else if (layout == Layout.FOOTER && ExternalModulesHandler.instance().hasTailProviders(accessor.getTileEntity()))
|
||||
tailProviders.addAll(ExternalModulesHandler.instance().getTailProviders(accessor.getTileEntity()));
|
||||
|
||||
/* Apply all collected providers */
|
||||
if (layout == Layout.HEADER)
|
||||
for (IWailaDataProvider dataProvider : headProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
if (layout == Layout.BODY)
|
||||
for (IWailaDataProvider dataProvider : bodyProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
if (layout == Layout.FOOTER)
|
||||
for (IWailaDataProvider dataProvider : tailProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
public boolean areMopDifferent(EntityPlayer player, MovingObjectPosition mop){
|
||||
return this.prevMOP.blockX != mop.blockX || this.prevMOP.blockY != mop.blockY || this.prevMOP.blockZ != mop.blockZ || prevWorldID != player.dimension;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package mcp.mobius.waila.handlers.hud;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mcp.mobius.waila.overlay.WailaTickHandler;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import codechicken.nei.api.IHighlightHandler;
|
||||
import codechicken.nei.api.ItemInfo.Layout;
|
||||
|
||||
public class HUDHandlerNEI implements IHighlightHandler {
|
||||
|
||||
@Override
|
||||
public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) {
|
||||
return WailaTickHandler.instance().identifiedHighlight;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, List<String> currenttip, Layout layout) {
|
||||
if (layout == Layout.HEADER){
|
||||
currenttip.addAll(WailaTickHandler.instance().currenttipHEAD);
|
||||
}
|
||||
if (layout == Layout.BODY){
|
||||
currenttip.addAll(WailaTickHandler.instance().currenttipBODY);
|
||||
}
|
||||
if (layout == Layout.FOOTER){
|
||||
currenttip.addAll(WailaTickHandler.instance().currenttipTAIL);
|
||||
}
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -14,6 +14,7 @@ import mcp.mobius.waila.addons.ConfigHandler;
|
||||
import mcp.mobius.waila.addons.ExternalModulesHandler;
|
||||
import mcp.mobius.waila.api.IWailaRegistrar;
|
||||
import mcp.mobius.waila.client.WailaClientEventHandler;
|
||||
import mcp.mobius.waila.handlers.hud.HUDHandlerExternal;
|
||||
import mcp.mobius.waila.network.WailaConnectionHandler;
|
||||
import mcp.mobius.waila.network.WailaPacketHandler;
|
||||
import mcp.mobius.waila.server.ProxyServer;
|
||||
|
||||
@@ -4,11 +4,13 @@ import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
|
||||
import mcp.mobius.waila.mod_Waila;
|
||||
import mcp.mobius.waila.handlers.hud.HUDHandlerExternal;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import codechicken.lib.lang.LangUtil;
|
||||
import codechicken.nei.api.ItemInfo.Layout;
|
||||
@@ -24,7 +26,7 @@ public class WailaTickHandler implements ITickHandler {
|
||||
public List<String> currenttipHEAD = new ArrayList<String>();
|
||||
public List<String> currenttipBODY = new ArrayList<String>();
|
||||
public List<String> currenttipTAIL = new ArrayList<String>();
|
||||
//public HUDHandlerExternal handler = new HUDHandlerExternal();
|
||||
public HUDHandlerExternal handler = new HUDHandlerExternal();
|
||||
|
||||
|
||||
private static WailaTickHandler _instance;
|
||||
@@ -49,26 +51,21 @@ public class WailaTickHandler implements ITickHandler {
|
||||
if(type.contains(TickType.CLIENT)){
|
||||
RayTracing.instance().fire();
|
||||
|
||||
/*
|
||||
World world = Minecraft.getMinecraft().theWorld;
|
||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||
ItemStack identifiedStack = RayTracing.raytracedStack;
|
||||
World world = Minecraft.getMinecraft().theWorld;
|
||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||
ItemStack targetStack = RayTracing.instance().getTargetStack();
|
||||
MovingObjectPosition target = RayTracing.instance().getTarget();
|
||||
|
||||
if (world != null && player != null && RayTracing.raytracedTarget != null){
|
||||
currenttipHEAD.clear();
|
||||
currenttipBODY.clear();
|
||||
currenttipTAIL.clear();
|
||||
|
||||
identifiedHighlight = handler.identifyHighlight(world, player, RayTracing.raytracedTarget);
|
||||
currenttipHEAD = handler.handleTextData(identifiedStack, world, player, RayTracing.raytracedTarget, currenttipHEAD, Layout.HEADER);
|
||||
currenttipBODY = handler.handleTextData(identifiedStack, world, player, RayTracing.raytracedTarget, currenttipBODY, Layout.BODY);
|
||||
currenttipTAIL = handler.handleTextData(identifiedStack, world, player, RayTracing.raytracedTarget, currenttipTAIL, Layout.FOOTER);
|
||||
|
||||
for(String s : currenttipBODY){
|
||||
System.out.printf("%s\n",s);
|
||||
}
|
||||
}
|
||||
*/
|
||||
if (world != null && player != null && target != null && targetStack != null){
|
||||
//this.currenttipHEAD.clear();
|
||||
//this.currenttipBODY.clear();
|
||||
//this.currenttipTAIL.clear();
|
||||
|
||||
this.identifiedHighlight = handler.identifyHighlight(world, player, target);
|
||||
this.currenttipHEAD = handler.handleTextData(targetStack, world, player, target, new ArrayList<String>(), Layout.HEADER);
|
||||
this.currenttipBODY = handler.handleTextData(targetStack, world, player, target, new ArrayList<String>(), Layout.BODY);
|
||||
this.currenttipTAIL = handler.handleTextData(targetStack, world, player, target, new ArrayList<String>(), Layout.FOOTER);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user