mirror of
https://github.com/GTNewHorizons/waila.git
synced 2026-11-19 03:49:17 +00:00
Compare commits
30
Commits
v1.5.8a_1.7.10
...
1.5.11
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07b0b83f4a | ||
|
|
d932d91a77 | ||
|
|
87261267e1 | ||
|
|
7af9692632 | ||
|
|
1eb78112eb | ||
|
|
4ed103dd25 | ||
|
|
118bab5a2b | ||
|
|
ce6474fc29 | ||
|
|
cbeb3b3628 | ||
|
|
d27d6db57c | ||
|
|
e60974ab20 | ||
|
|
f481e46fb2 | ||
|
|
7638322f7f | ||
|
|
0afbc6efb4 | ||
|
|
6d97a3a595 | ||
|
|
737c4e2cbf | ||
|
|
f4f5920d88 | ||
|
|
ea95fadb78 | ||
|
|
77277c6024 | ||
|
|
0b85d18865 | ||
|
|
9d0b942667 | ||
|
|
caf8cf7e7b | ||
|
|
01546d40e9 | ||
|
|
6d6e7616e4 | ||
|
|
1c2af8da33 | ||
|
|
197305bf78 | ||
|
|
8483573146 | ||
|
|
a05c6aa6d7 | ||
|
|
28196d451e | ||
|
|
e83009414e |
No files matched your search
@@ -1,2 +1,10 @@
|
||||
syntax: glob
|
||||
*.orig
|
||||
.gradle
|
||||
build
|
||||
eclipse
|
||||
out
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
src/main/java/net/*
|
||||
+2
-2
@@ -35,7 +35,7 @@ apply plugin: 'java'
|
||||
apply plugin: 'forge'
|
||||
apply plugin: 'maven'
|
||||
|
||||
version = "1.5.8_1.7.10"
|
||||
version = "1.5.11-RC3_1.7.10"
|
||||
group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||
archivesBaseName = "Waila"
|
||||
|
||||
@@ -57,7 +57,7 @@ dependencies {
|
||||
}
|
||||
|
||||
minecraft {
|
||||
version = "1.7.10-10.13.2.1264"
|
||||
version = "1.7.10-${config.forge_version}-1.7.10"
|
||||
runDir = "eclipse"
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -1,7 +1,7 @@
|
||||
mc_version=1.7.10
|
||||
forge_version=10.13.0.1187
|
||||
ccl_version=1.1.1.106
|
||||
ccc_version=1.0.4.+
|
||||
nei_version=1.0.4.+
|
||||
forge_version=10.13.4.1448
|
||||
ccl_version=1.1.3.138
|
||||
ccc_version=1.0.7.+
|
||||
nei_version=1.0.5.+
|
||||
mod_version=1.0
|
||||
waila_version=1.5.2a
|
||||
@@ -44,7 +44,7 @@ import mcp.mobius.waila.cbcore.LangUtil;
|
||||
import mcp.mobius.waila.client.KeyEvent;
|
||||
import mcp.mobius.waila.commands.CommandDumpHandlers;
|
||||
|
||||
@Mod(modid="Waila", name="Waila", version="1.5.8", dependencies="after:NotEnoughItems@[1.0.4.0,)", acceptableRemoteVersions="*")
|
||||
@Mod(modid="Waila", name="Waila", version="1.5.11", dependencies="after:NotEnoughItems@[1.0.4.0,)", acceptableRemoteVersions="*")
|
||||
/*
|
||||
@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class,
|
||||
packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)")
|
||||
|
||||
@@ -14,7 +14,7 @@ public class ExtraUtilitiesModule {
|
||||
|
||||
|
||||
try{
|
||||
Class ModExtraUtilities = Class.forName("extrautils.ExtraUtils");
|
||||
Class ModExtraUtilities = Class.forName("com.rwtema.extrautils.ExtraUtils");
|
||||
Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
|
||||
} catch (ClassNotFoundException e){
|
||||
Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
|
||||
@@ -22,7 +22,7 @@ public class ExtraUtilitiesModule {
|
||||
}
|
||||
|
||||
try{
|
||||
TileEntityDrum = Class.forName("extrautils.tileentity.TileEntityDrum");
|
||||
TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum");
|
||||
} catch (ClassNotFoundException e){
|
||||
Waila.log.log(Level.WARN, "[ExtraUtilities] Class not found. " + e);
|
||||
return;
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package mcp.mobius.waila.addons.thermaldynamics;
|
||||
|
||||
import mcp.mobius.waila.api.IWailaConfigHandler;
|
||||
import mcp.mobius.waila.api.IWailaDataAccessor;
|
||||
import mcp.mobius.waila.api.IWailaDataProvider;
|
||||
import mcp.mobius.waila.cbcore.LangUtil;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by Lordmau5 on 28.02.2015.
|
||||
*/
|
||||
public class HUDHandlerDuct implements IWailaDataProvider {
|
||||
|
||||
@Override
|
||||
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
if (!config.getConfig("thermaldynamics.fluiductsFluid")) return currenttip;
|
||||
|
||||
FluidStack fluid = FluidStack.loadFluidStackFromNBT(accessor.getNBTData());
|
||||
|
||||
String name = "";
|
||||
|
||||
try{
|
||||
name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
|
||||
} catch (NullPointerException f){
|
||||
name += " " + LangUtil.translateG("hud.msg.empty");
|
||||
}
|
||||
|
||||
currenttip.add(name);
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
if (!config.getConfig("thermaldynamics.fluiductsAmount")) return currenttip;
|
||||
|
||||
int amount = 0;
|
||||
|
||||
NBTTagCompound tag = accessor.getNBTData();
|
||||
if (tag.hasKey("Amount"))
|
||||
amount = accessor.getNBTInteger(tag, "Amount");
|
||||
|
||||
currenttip.add(String.format(" %d / 1000 mB", amount));
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
|
||||
if (te != null)
|
||||
te.writeToNBT(tag);
|
||||
return tag;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package mcp.mobius.waila.addons.thermaldynamics;
|
||||
|
||||
import mcp.mobius.waila.Waila;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
public class ThermalDynamicsModule {
|
||||
|
||||
public static Class TileFluidDuct = null;
|
||||
|
||||
public static void register(){
|
||||
// XXX : We register the Fluiduct
|
||||
try{
|
||||
TileFluidDuct = Class.forName("cofh.thermaldynamics.ducts.fluid.TileFluidDuct");
|
||||
|
||||
ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsFluid");
|
||||
ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsAmount");
|
||||
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerDuct(), TileFluidDuct);
|
||||
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDuct(), TileFluidDuct);
|
||||
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerDuct(), TileFluidDuct);
|
||||
|
||||
} catch (Exception e){
|
||||
Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks." + e);
|
||||
}
|
||||
|
||||
// XXX : We register the IBlockInfo interface
|
||||
/*
|
||||
try{
|
||||
IBlockInfo = Class.forName("cofh.api.block.IBlockInfo");
|
||||
IBlockInfo_getBlockInfo = IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, ForgeDirection.class, EntityPlayer.class, List.class, boolean.class);
|
||||
|
||||
|
||||
//ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
|
||||
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo);
|
||||
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo);
|
||||
|
||||
} catch (Exception e){
|
||||
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package mcp.mobius.waila.addons.thermalexpansion;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
import mcp.mobius.waila.api.IWailaConfigHandler;
|
||||
import mcp.mobius.waila.api.IWailaDataAccessor;
|
||||
import mcp.mobius.waila.api.IWailaDataProvider;
|
||||
import mcp.mobius.waila.api.SpecialChars;
|
||||
import mcp.mobius.waila.cbcore.LangUtil;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.List;
|
||||
|
||||
public class HUDHandlerCache implements IWailaDataProvider {
|
||||
|
||||
@Override
|
||||
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return null; }
|
||||
|
||||
@Override
|
||||
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
if(!config.getConfig("thermalexpansion.cache"))
|
||||
return currenttip;
|
||||
try {
|
||||
ItemStack storedItem = null;
|
||||
if(accessor.getNBTData().hasKey("Item"))
|
||||
storedItem = readItemStack(accessor.getNBTData().getCompoundTag("Item"));
|
||||
|
||||
String name = currenttip.get(0);
|
||||
String color = "";
|
||||
if(name.startsWith("\u00a7"))
|
||||
color = name.substring(0, 2);
|
||||
|
||||
if(storedItem != null) {
|
||||
String namex = GameData.getItemRegistry().getNameForObject(storedItem.getItem());
|
||||
name += String.format(" < " + SpecialChars.getRenderString("waila.stack", "1", namex, "0", String.valueOf(storedItem.getItemDamage())) + color + " %s >", storedItem.getDisplayName());
|
||||
}
|
||||
else
|
||||
name += " " + LangUtil.translateG("hud.msg.empty");
|
||||
|
||||
currenttip.set(0, name);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
if (!config.getConfig("thermalexpansion.cache"))
|
||||
return currenttip;
|
||||
|
||||
NBTTagCompound tag = accessor.getNBTData();
|
||||
ItemStack storedItem = null;
|
||||
if(tag.hasKey("Item"))
|
||||
storedItem = readItemStack(tag.getCompoundTag("Item"));
|
||||
|
||||
int stored = 0;
|
||||
int maxStored = 0;
|
||||
if(tag.hasKey("Stored"))
|
||||
stored = tag.getInteger("Stored");
|
||||
if(tag.hasKey("MaxStored"))
|
||||
maxStored = tag.getInteger("MaxStored");
|
||||
|
||||
if(storedItem != null) {
|
||||
currenttip.add("Stored: " + stored + "/" + maxStored);
|
||||
}
|
||||
else
|
||||
currenttip.add("Capacity: " + maxStored);
|
||||
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
|
||||
if(te != null)
|
||||
te.writeToNBT(tag);
|
||||
try {
|
||||
tag.setInteger("MaxStored", (Integer) ThermalExpansionModule.TileCache_getMaxStored.invoke(te));
|
||||
tag.setInteger("Stored", (Integer) ThermalExpansionModule.TileCache_getStored.invoke(te));
|
||||
} catch (InvocationTargetException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return tag;
|
||||
}
|
||||
|
||||
public ItemStack readItemStack(NBTTagCompound tag) {
|
||||
ItemStack is = new ItemStack(Item.getItemById(tag.getShort("id")));
|
||||
is.stackSize = tag.getInteger("Count");
|
||||
is.setItemDamage(Math.max(0, tag.getShort("Damage")));
|
||||
if (tag.hasKey("tag", 10)) {
|
||||
is.stackTagCompound = tag.getCompoundTag("tag");
|
||||
}
|
||||
|
||||
return is;
|
||||
}
|
||||
|
||||
}
|
||||
+34
-17
@@ -1,16 +1,12 @@
|
||||
package mcp.mobius.waila.addons.thermalexpansion;
|
||||
|
||||
import mcp.mobius.waila.Waila;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import mcp.mobius.waila.Waila;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
|
||||
public class ThermalExpansionModule {
|
||||
|
||||
@@ -44,6 +40,11 @@ public class ThermalExpansionModule {
|
||||
public static Class ISecureTile = null;
|
||||
public static Method ISecureTile_getAccess = null;
|
||||
public static Method ISecureTile_getOwnerName = null;
|
||||
|
||||
public static Class TileCache = null;
|
||||
public static Method TileCache_getItemStack = null;
|
||||
public static Method TileCache_getMaxStored = null;
|
||||
public static Method TileCache_getStored = null;
|
||||
|
||||
public static Class BlockMultipart = null;
|
||||
|
||||
@@ -76,15 +77,15 @@ public class ThermalExpansionModule {
|
||||
|
||||
} catch (Exception e){
|
||||
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e);
|
||||
}
|
||||
}
|
||||
|
||||
// XXX : We register the energy cell
|
||||
try{
|
||||
TileEnergyCell = Class.forName("thermalexpansion.block.cell.TileCell");
|
||||
TileEnergyCell = Class.forName("cofh.thermalexpansion.block.cell.TileCell");
|
||||
TileEnergyCell_Recv = TileEnergyCell.getDeclaredField("energyReceive");
|
||||
TileEnergyCell_Send = TileEnergyCell.getDeclaredField("energySend");
|
||||
|
||||
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell");
|
||||
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell");
|
||||
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
|
||||
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerEnergyCell(), TileEnergyCell);
|
||||
|
||||
@@ -94,7 +95,7 @@ public class ThermalExpansionModule {
|
||||
|
||||
// XXX : We register the Tank interface
|
||||
try{
|
||||
TileTank = Class.forName("thermalexpansion.block.tank.TileTank");
|
||||
TileTank = Class.forName("cofh.thermalexpansion.block.tank.TileTank");
|
||||
TileTank_getTankFluid = TileTank.getMethod("getTankFluid");
|
||||
TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity");
|
||||
TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount");
|
||||
@@ -113,7 +114,7 @@ public class ThermalExpansionModule {
|
||||
|
||||
// XXX : We register the Tesseract interface
|
||||
try{
|
||||
TileTesseract = Class.forName("thermalexpansion.block.ender.TileTesseract");
|
||||
TileTesseract = Class.forName("cofh.thermalexpansion.block.ender.TileTesseract");
|
||||
TileTesseract_Item = TileTesseract.getDeclaredField("modeItem");
|
||||
TileTesseract_Fluid = TileTesseract.getDeclaredField("modeFluid");
|
||||
TileTesseract_Energy = TileTesseract.getDeclaredField("modeEnergy");
|
||||
@@ -141,9 +142,25 @@ public class ThermalExpansionModule {
|
||||
|
||||
} catch (Exception e){
|
||||
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e);
|
||||
}
|
||||
|
||||
// XXX : We register the IBlockInfo interface
|
||||
}
|
||||
|
||||
// XXX : We register the Cache interface
|
||||
try{
|
||||
TileCache = Class.forName("cofh.thermalexpansion.block.cache.TileCache");
|
||||
TileCache_getItemStack = TileCache.getDeclaredMethod("getStoredItemType");
|
||||
TileCache_getMaxStored = TileCache.getDeclaredMethod("getMaxStoredCount");
|
||||
TileCache_getStored = TileCache.getDeclaredMethod("getStoredCount");
|
||||
|
||||
ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.cache");
|
||||
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerCache(), TileCache);
|
||||
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCache(), TileCache);
|
||||
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerCache(), TileCache);
|
||||
|
||||
} catch (Exception e){
|
||||
Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e);
|
||||
}
|
||||
|
||||
// XXX : We register the IBlockInfo interface
|
||||
/*
|
||||
try{
|
||||
IBlockInfo = Class.forName("cofh.api.block.IBlockInfo");
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
package mcp.mobius.waila.addons.vanillamc;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.tileentity.TileEntityFurnace;
|
||||
import net.minecraft.world.World;
|
||||
import mcp.mobius.waila.api.IWailaConfigHandler;
|
||||
import mcp.mobius.waila.api.IWailaDataAccessor;
|
||||
import mcp.mobius.waila.api.IWailaDataProvider;
|
||||
import mcp.mobius.waila.api.SpecialChars;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
|
||||
public class HUDHandlerFurnace implements IWailaDataProvider {
|
||||
|
||||
@Override
|
||||
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
int cookTime = accessor.getNBTData().getShort("CookTime");
|
||||
NBTTagList tag = accessor.getNBTData().getTagList("Items", 10);
|
||||
|
||||
String renderStr = "";
|
||||
{
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(0));
|
||||
String name = GameData.getItemRegistry().getNameForObject(stack.getItem());
|
||||
renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage()));
|
||||
}
|
||||
{
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(1));
|
||||
String name = GameData.getItemRegistry().getNameForObject(stack.getItem());
|
||||
renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage()));
|
||||
}
|
||||
|
||||
renderStr += SpecialChars.getRenderString("waila.progress", String.valueOf(cookTime), String.valueOf(200));
|
||||
|
||||
{
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(2));
|
||||
String name = GameData.getItemRegistry().getNameForObject(stack.getItem());
|
||||
renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage()));
|
||||
}
|
||||
|
||||
currenttip.add(renderStr);
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
|
||||
if (te != null)
|
||||
te.writeToNBT(tag);
|
||||
return tag;
|
||||
}
|
||||
|
||||
public static void register(){
|
||||
//ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFurnace(), TileEntityFurnace.class);
|
||||
//ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerFurnace(), TileEntityFurnace.class);
|
||||
}
|
||||
}
|
||||
@@ -40,6 +40,9 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
|
||||
static Block doubleplant = Blocks.double_plant;
|
||||
static Block leave = Blocks.leaves;
|
||||
static Block leave2 = Blocks.leaves2;
|
||||
static Block log = Blocks.log;
|
||||
static Block log2 = Blocks.log2;
|
||||
static Block quartz = Blocks.quartz_block;
|
||||
|
||||
@Override
|
||||
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
|
||||
@@ -84,6 +87,14 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
|
||||
return new ItemStack(block, 1, accessor.getMetadata() - 4);
|
||||
}
|
||||
|
||||
if (block == log || block == log2){
|
||||
return new ItemStack(block, 1, accessor.getMetadata()%4);
|
||||
}
|
||||
|
||||
if ((block == quartz) && (accessor.getMetadata() > 2)){
|
||||
return new ItemStack(block, 1, 2);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
}
|
||||
@@ -228,6 +239,9 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
|
||||
ModuleRegistrar.instance().registerStackProvider(provider, crops.getClass());
|
||||
ModuleRegistrar.instance().registerStackProvider(provider, leave.getClass());
|
||||
ModuleRegistrar.instance().registerStackProvider(provider, leave2.getClass());
|
||||
ModuleRegistrar.instance().registerStackProvider(provider, log.getClass());
|
||||
ModuleRegistrar.instance().registerStackProvider(provider, log2.getClass());
|
||||
ModuleRegistrar.instance().registerStackProvider(provider, quartz.getClass());
|
||||
|
||||
//ModuleRegistrar.instance().registerStackProvider(provider, Block.class);
|
||||
ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass());
|
||||
|
||||
@@ -135,7 +135,10 @@ public class ConfigHandler implements IWailaConfigHandler {
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Some accessor helpers */
|
||||
public boolean showTooltip(){
|
||||
return getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -3,6 +3,8 @@ package mcp.mobius.waila.api.impl;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import mcp.mobius.waila.Waila;
|
||||
import mcp.mobius.waila.api.IWailaBlock;
|
||||
@@ -12,6 +14,7 @@ import mcp.mobius.waila.cbcore.Layout;
|
||||
import mcp.mobius.waila.network.Message0x01TERequest;
|
||||
import mcp.mobius.waila.network.Message0x03EntRequest;
|
||||
import mcp.mobius.waila.network.WailaPacketHandler;
|
||||
import mcp.mobius.waila.utils.Constants;
|
||||
import mcp.mobius.waila.utils.WailaExceptionHandler;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -21,16 +24,17 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
public class MetaDataProvider{
|
||||
|
||||
private ArrayList<IWailaDataProvider> headBlockProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> bodyBlockProviders = new ArrayList<IWailaDataProvider>();
|
||||
private ArrayList<IWailaDataProvider> tailBlockProviders = new ArrayList<IWailaDataProvider>();
|
||||
private Map<Integer, List<IWailaDataProvider>> headBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
|
||||
private Map<Integer, List<IWailaDataProvider>> bodyBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
|
||||
private Map<Integer, List<IWailaDataProvider>> tailBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
|
||||
|
||||
private ArrayList<IWailaEntityProvider> headEntityProviders = new ArrayList<IWailaEntityProvider>();
|
||||
private ArrayList<IWailaEntityProvider> bodyEntityProviders = new ArrayList<IWailaEntityProvider>();
|
||||
private ArrayList<IWailaEntityProvider> tailEntityProviders = new ArrayList<IWailaEntityProvider>();
|
||||
private Map<Integer, List<IWailaEntityProvider>> headEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
|
||||
private Map<Integer, List<IWailaEntityProvider>> bodyEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
|
||||
private Map<Integer, List<IWailaEntityProvider>> tailEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
|
||||
|
||||
private Class prevBlock = null;
|
||||
private Class prevTile = null;
|
||||
@@ -48,14 +52,16 @@ public class MetaDataProvider{
|
||||
}
|
||||
|
||||
if(ModuleRegistrar.instance().hasStackProviders(block)){
|
||||
for (IWailaDataProvider dataProvider : ModuleRegistrar.instance().getStackProviders(block)){
|
||||
try{
|
||||
ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance());
|
||||
if (retval != null)
|
||||
return retval;
|
||||
}catch (Throwable e){
|
||||
WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), null);
|
||||
}
|
||||
for (List<IWailaDataProvider> providerList : ModuleRegistrar.instance().getStackProviders(block).values()){
|
||||
for (IWailaDataProvider dataProvider : providerList){
|
||||
try{
|
||||
ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance());
|
||||
if (retval != null)
|
||||
return retval;
|
||||
}catch (Throwable e){
|
||||
WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
@@ -64,7 +70,7 @@ public class MetaDataProvider{
|
||||
public List<String> handleBlockTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon accessor, List<String> currenttip, Layout layout) {
|
||||
Block block = accessor.getBlock();
|
||||
|
||||
if (accessor.getTileEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){
|
||||
if (accessor.getTileEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250) && ConfigHandler.instance().showTooltip()){
|
||||
accessor.resetTimer();
|
||||
HashSet<String> keys = new HashSet<String>();
|
||||
|
||||
@@ -77,7 +83,7 @@ public class MetaDataProvider{
|
||||
if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTProviders(block) || ModuleRegistrar.instance().hasNBTProviders(accessor.getTileEntity()))
|
||||
WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity(), keys));
|
||||
|
||||
} else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) {
|
||||
} else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250) && ConfigHandler.instance().showTooltip()) {
|
||||
|
||||
try{
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
@@ -117,50 +123,54 @@ public class MetaDataProvider{
|
||||
|
||||
/* Lookup by class (for blocks)*/
|
||||
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block))
|
||||
headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(block));
|
||||
headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(block));
|
||||
|
||||
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block))
|
||||
bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(block));
|
||||
bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(block));
|
||||
|
||||
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block))
|
||||
tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(block));
|
||||
tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(block));
|
||||
|
||||
|
||||
/* Lookup by class (for tileentities)*/
|
||||
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity()))
|
||||
headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
|
||||
headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
|
||||
|
||||
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity()))
|
||||
bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
|
||||
bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
|
||||
|
||||
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity()))
|
||||
tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
|
||||
tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
|
||||
|
||||
/* Apply all collected providers */
|
||||
if (layout == Layout.HEADER)
|
||||
for (IWailaDataProvider dataProvider : headBlockProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
for (List<IWailaDataProvider> providersList : headBlockProviders.values()){
|
||||
for (IWailaDataProvider dataProvider : providersList)
|
||||
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 : bodyBlockProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
if (layout == Layout.BODY)
|
||||
for (List<IWailaDataProvider> providersList : bodyBlockProviders.values()){
|
||||
for (IWailaDataProvider dataProvider : providersList)
|
||||
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 : tailBlockProviders)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
|
||||
for (List<IWailaDataProvider> providersList : tailBlockProviders.values()){
|
||||
for (IWailaDataProvider dataProvider : providersList)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
}
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@@ -193,38 +203,44 @@ public class MetaDataProvider{
|
||||
|
||||
/* Lookup by class (for entities)*/
|
||||
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadEntityProviders(entity))
|
||||
headEntityProviders.addAll(ModuleRegistrar.instance().getHeadEntityProviders(entity));
|
||||
headEntityProviders.putAll(ModuleRegistrar.instance().getHeadEntityProviders(entity));
|
||||
|
||||
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity))
|
||||
bodyEntityProviders.addAll(ModuleRegistrar.instance().getBodyEntityProviders(entity));
|
||||
bodyEntityProviders.putAll(ModuleRegistrar.instance().getBodyEntityProviders(entity));
|
||||
|
||||
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity))
|
||||
tailEntityProviders.addAll(ModuleRegistrar.instance().getTailEntityProviders(entity));
|
||||
tailEntityProviders.putAll(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);
|
||||
}
|
||||
for (List<IWailaEntityProvider> providersList : headEntityProviders.values()){
|
||||
for (IWailaEntityProvider dataProvider : providersList)
|
||||
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);
|
||||
}
|
||||
for (List<IWailaEntityProvider> providersList : bodyEntityProviders.values()){
|
||||
for (IWailaEntityProvider dataProvider : providersList)
|
||||
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);
|
||||
}
|
||||
for (List<IWailaEntityProvider> providersList : tailEntityProviders.values()){
|
||||
for (IWailaEntityProvider dataProvider : providersList)
|
||||
try{
|
||||
currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance());
|
||||
} catch (Throwable e){
|
||||
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
|
||||
}
|
||||
}
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
@@ -5,10 +5,13 @@ import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
@@ -230,67 +233,67 @@ public class ModuleRegistrar implements IWailaRegistrar {
|
||||
|
||||
/* PROVIDER GETTERS */
|
||||
|
||||
public ArrayList<IWailaDataProvider> getHeadProviders(Object block) {
|
||||
public Map<Integer, List<IWailaDataProvider>> getHeadProviders(Object block) {
|
||||
return getProviders(block, this.headBlockProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaDataProvider> getBodyProviders(Object block) {
|
||||
public Map<Integer, List<IWailaDataProvider>> getBodyProviders(Object block) {
|
||||
return getProviders(block, this.bodyBlockProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaDataProvider> getTailProviders(Object block) {
|
||||
public Map<Integer, List<IWailaDataProvider>> getTailProviders(Object block) {
|
||||
return getProviders(block, this.tailBlockProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaDataProvider> getStackProviders(Object block) {
|
||||
public Map<Integer, List<IWailaDataProvider>> getStackProviders(Object block) {
|
||||
return getProviders(block, this.stackBlockProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaDataProvider> getNBTProviders(Object block) {
|
||||
public Map<Integer, List<IWailaDataProvider>> getNBTProviders(Object block) {
|
||||
return getProviders(block, this.NBTDataProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaEntityProvider> getHeadEntityProviders(Object entity) {
|
||||
public Map<Integer, List<IWailaEntityProvider>> getHeadEntityProviders(Object entity) {
|
||||
return getProviders(entity, this.headEntityProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaEntityProvider> getBodyEntityProviders(Object entity) {
|
||||
public Map<Integer, List<IWailaEntityProvider>> getBodyEntityProviders(Object entity) {
|
||||
return getProviders(entity, this.bodyEntityProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaEntityProvider> getTailEntityProviders(Object entity) {
|
||||
public Map<Integer, List<IWailaEntityProvider>> getTailEntityProviders(Object entity) {
|
||||
return getProviders(entity, this.tailEntityProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaEntityProvider> getOverrideEntityProviders(Object entity) {
|
||||
public Map<Integer, List<IWailaEntityProvider>> getOverrideEntityProviders(Object entity) {
|
||||
return getProviders(entity, this.overrideEntityProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaEntityProvider> getNBTEntityProviders(Object entity) {
|
||||
public Map<Integer, List<IWailaEntityProvider>> getNBTEntityProviders(Object entity) {
|
||||
return getProviders(entity, this.NBTEntityProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaFMPProvider> getHeadFMPProviders(String name) {
|
||||
public Map<Integer, List<IWailaFMPProvider>> getHeadFMPProviders(String name) {
|
||||
return getProviders(name, this.headFMPProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaFMPProvider> getBodyFMPProviders(String name) {
|
||||
public Map<Integer, List<IWailaFMPProvider>> getBodyFMPProviders(String name) {
|
||||
return getProviders(name, this.bodyFMPProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaFMPProvider> getTailFMPProviders(String name) {
|
||||
public Map<Integer, List<IWailaFMPProvider>> getTailFMPProviders(String name) {
|
||||
return getProviders(name, this.tailFMPProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaSummaryProvider> getSummaryProvider(Object item){
|
||||
public Map<Integer, List<IWailaSummaryProvider>> getSummaryProvider(Object item){
|
||||
return getProviders(item, this.summaryProviders);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaBlockDecorator> getBlockDecorators(Object block){
|
||||
public Map<Integer, List<IWailaBlockDecorator>> getBlockDecorators(Object block){
|
||||
return getProviders(block, this.blockClassDecorators);
|
||||
}
|
||||
|
||||
public ArrayList<IWailaFMPDecorator> getFMPDecorators(String name){
|
||||
public Map<Integer, List<IWailaFMPDecorator>> getFMPDecorators(String name){
|
||||
return getProviders(name, this.FMPClassDecorators);
|
||||
}
|
||||
|
||||
@@ -298,17 +301,24 @@ public class ModuleRegistrar implements IWailaRegistrar {
|
||||
return this.tooltipRenderers.get(name);
|
||||
}
|
||||
|
||||
private <T> ArrayList<T> getProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target){
|
||||
ArrayList<T> returnList = new ArrayList<T>();
|
||||
for (Class clazz : target.keySet())
|
||||
private <T> Map<Integer, List<T>> getProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target){
|
||||
Map<Integer, List<T>> returnList = new TreeMap<Integer, List<T>>();
|
||||
Integer index = 0;
|
||||
|
||||
for (Class clazz : target.keySet()){
|
||||
if (clazz.isInstance(obj))
|
||||
returnList.addAll(target.get(clazz));
|
||||
|
||||
returnList.put(index, target.get(clazz));
|
||||
|
||||
index++;
|
||||
}
|
||||
|
||||
return returnList;
|
||||
}
|
||||
|
||||
private <T> ArrayList<T> getProviders(String name, LinkedHashMap<String, ArrayList<T>> target){
|
||||
return target.get(name);
|
||||
private <T> Map<Integer, List<T>> getProviders(String name, LinkedHashMap<String, ArrayList<T>> target){
|
||||
Map<Integer, List<T>> returnList = new TreeMap<Integer, List<T>>();
|
||||
returnList.put(0, target.get(name));
|
||||
return returnList;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
package mcp.mobius.waila.client;
|
||||
|
||||
import mcp.mobius.waila.Waila;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import mcp.mobius.waila.gui.truetyper.FontLoader;
|
||||
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
|
||||
import mcp.mobius.waila.handlers.HUDHandlerBlocks;
|
||||
import mcp.mobius.waila.handlers.HUDHandlerEntities;
|
||||
import mcp.mobius.waila.handlers.VanillaTooltipHandler;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderHealth;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderProgressBar;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderStack;
|
||||
//import mcp.mobius.waila.handlers.SummaryProviderDefault;
|
||||
import mcp.mobius.waila.server.ProxyServer;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -37,7 +41,10 @@ public class ProxyClient extends ProxyServer {
|
||||
if (Loader.isModLoaded("NotEnoughItems")){
|
||||
try{
|
||||
Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("register").invoke(null);
|
||||
} catch (Exception e){}
|
||||
} catch (Exception e){
|
||||
Waila.log.error("Failed to hook into NEI properly. Reverting to Vanilla tooltip handler");
|
||||
MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler());
|
||||
}
|
||||
} else {
|
||||
MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler());
|
||||
}
|
||||
@@ -50,9 +57,14 @@ public class ProxyClient extends ProxyServer {
|
||||
ModuleRegistrar.instance().registerTailProvider(new HUDHandlerEntities(), Entity.class);
|
||||
|
||||
//ModuleRegistrar.instance().registerShortDataProvider(new SummaryProviderDefault(), Item.class);
|
||||
|
||||
|
||||
ModuleRegistrar.instance().addConfig("General", "general.showents");
|
||||
ModuleRegistrar.instance().addConfig("General", "general.showhp");
|
||||
ModuleRegistrar.instance().addConfig("General", "general.showcrop");
|
||||
ModuleRegistrar.instance().addConfig("General", "general.showcrop");
|
||||
|
||||
ModuleRegistrar.instance().registerTooltipRenderer("waila.health", new TTRenderHealth());
|
||||
ModuleRegistrar.instance().registerTooltipRenderer("waila.stack", new TTRenderStack());
|
||||
ModuleRegistrar.instance().registerTooltipRenderer("waila.progress", new TTRenderProgressBar());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -35,10 +35,12 @@ public class FontHelper {
|
||||
private static String formatEscape = "\u00A7";
|
||||
|
||||
|
||||
/*
|
||||
public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float... rgba){
|
||||
drawString(s,x,y,font,scaleX,scaleY,0,rgba);
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float rotationZ, float... rgba){
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package mcp.mobius.waila.handlers;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -25,8 +27,9 @@ public class DecoratorFMP implements IWailaBlockDecorator {
|
||||
if (ModuleRegistrar.instance().hasFMPDecorator(id)){
|
||||
DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id, accessor.getRenderingPosition(), accessor.getPartialFrame());
|
||||
|
||||
for (IWailaFMPDecorator provider : ModuleRegistrar.instance().getFMPDecorators(id))
|
||||
provider.decorateBlock(itemStack, DataAccessorFMP.instance, config);
|
||||
for (List<IWailaFMPDecorator> providersList : ModuleRegistrar.instance().getFMPDecorators(id).values())
|
||||
for (IWailaFMPDecorator provider : providersList)
|
||||
provider.decorateBlock(itemStack, DataAccessorFMP.instance, config);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,36 +48,11 @@ public class HUDHandlerEntities implements IWailaEntityProvider {
|
||||
float health = ((EntityLivingBase)entity).getHealth() / 2.0f;
|
||||
float maxhp = ((EntityLivingBase)entity).getMaxHealth() / 2.0f;
|
||||
|
||||
if (((EntityLivingBase)entity).getHealth() > maxhpfortext)
|
||||
if (((EntityLivingBase)entity).getMaxHealth() > maxhpfortext)
|
||||
currenttip.add(String.format("HP : " + WHITE + "%.0f" + GRAY + " / " + WHITE + "%.0f", ((EntityLivingBase)entity).getHealth(), ((EntityLivingBase)entity).getMaxHealth()));
|
||||
|
||||
else{
|
||||
for (int i = 0; i < MathHelper.floor_float(health); i++){
|
||||
hptip += HEART;
|
||||
if(hptip.length() % (nhearts * HEART.length()) == 0){
|
||||
currenttip.add(hptip);
|
||||
hptip = "";
|
||||
}
|
||||
}
|
||||
|
||||
if (((EntityLivingBase)entity).getHealth() > MathHelper.floor_float(health) * 2.0f){
|
||||
hptip += HHEART;
|
||||
if(hptip.length() % (nhearts * HEART.length()) == 0){
|
||||
currenttip.add(hptip);
|
||||
hptip = "";
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < MathHelper.floor_float(maxhp - health); i++){
|
||||
hptip += EHEART;
|
||||
if(hptip.length() % (nhearts * HEART.length()) == 0){
|
||||
currenttip.add(hptip);
|
||||
hptip = "";
|
||||
}
|
||||
}
|
||||
|
||||
if (!hptip.equals(""))
|
||||
currenttip.add(hptip);
|
||||
currenttip.add(getRenderString("waila.health", String.valueOf(nhearts), String.valueOf(health), String.valueOf(maxhp)));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -36,8 +36,10 @@ public class HUDHandlerFMP implements IWailaDataProvider {
|
||||
if (ModuleRegistrar.instance().hasHeadFMPProviders(id)){
|
||||
DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id);
|
||||
|
||||
for (IWailaFMPProvider provider : ModuleRegistrar.instance().getHeadFMPProviders(id))
|
||||
currenttip = provider.getWailaHead(itemStack, currenttip, DataAccessorFMP.instance, config);
|
||||
for (List<IWailaFMPProvider> providersList : ModuleRegistrar.instance().getHeadFMPProviders(id).values()){
|
||||
for (IWailaFMPProvider provider : providersList)
|
||||
currenttip = provider.getWailaHead(itemStack, currenttip, DataAccessorFMP.instance, config);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,8 +56,10 @@ public class HUDHandlerFMP implements IWailaDataProvider {
|
||||
if (ModuleRegistrar.instance().hasBodyFMPProviders(id)){
|
||||
DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id);
|
||||
|
||||
for (IWailaFMPProvider provider : ModuleRegistrar.instance().getBodyFMPProviders(id))
|
||||
currenttip = provider.getWailaBody(itemStack, currenttip, DataAccessorFMP.instance, config);
|
||||
for (List<IWailaFMPProvider> providersList : ModuleRegistrar.instance().getBodyFMPProviders(id).values()){
|
||||
for (IWailaFMPProvider provider : providersList)
|
||||
currenttip = provider.getWailaBody(itemStack, currenttip, DataAccessorFMP.instance, config);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,8 +76,10 @@ public class HUDHandlerFMP implements IWailaDataProvider {
|
||||
if (ModuleRegistrar.instance().hasTailFMPProviders(id)){
|
||||
DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id);
|
||||
|
||||
for (IWailaFMPProvider provider : ModuleRegistrar.instance().getTailFMPProviders(id))
|
||||
currenttip = provider.getWailaTail(itemStack, currenttip, DataAccessorFMP.instance, config);
|
||||
for (List<IWailaFMPProvider> providersList : ModuleRegistrar.instance().getTailFMPProviders(id).values()){
|
||||
for (IWailaFMPProvider provider : providersList)
|
||||
currenttip = provider.getWailaTail(itemStack, currenttip, DataAccessorFMP.instance, config);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
package mcp.mobius.waila.network;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.channel.SimpleChannelInboundHandler;
|
||||
import mcp.mobius.waila.api.IWailaDataProvider;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import mcp.mobius.waila.utils.AccessHelper;
|
||||
@@ -19,10 +18,11 @@ import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelFutureListener;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.channel.SimpleChannelInboundHandler;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x01TERequest> implements IWailaMessage {
|
||||
|
||||
@@ -112,25 +112,30 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x0
|
||||
|
||||
EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity;
|
||||
|
||||
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(block)){
|
||||
try{
|
||||
tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
} catch (AbstractMethodError ame){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
} catch (NoSuchMethodError nsm){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
}
|
||||
}
|
||||
for (List<IWailaDataProvider> providersList : ModuleRegistrar.instance().getNBTProviders(block).values()){
|
||||
for (IWailaDataProvider provider : providersList){
|
||||
try{
|
||||
tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
} catch (AbstractMethodError ame){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
} catch (NoSuchMethodError nsm){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(entity)){
|
||||
try{
|
||||
tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
} catch (AbstractMethodError ame){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
} catch (NoSuchMethodError nsm){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
}
|
||||
}
|
||||
|
||||
for (List<IWailaDataProvider> providersList : ModuleRegistrar.instance().getNBTProviders(entity).values()){
|
||||
for (IWailaDataProvider provider : providersList){
|
||||
try{
|
||||
tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
} catch (AbstractMethodError ame){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
} catch (NoSuchMethodError nsm){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
entity.writeToNBT(tag);
|
||||
@@ -140,11 +145,10 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x0
|
||||
tag.setInteger("WailaX", msg.posX);
|
||||
tag.setInteger("WailaY", msg.posY);
|
||||
tag.setInteger("WailaZ", msg.posZ);
|
||||
tag.setString ("WailaID", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass()));
|
||||
|
||||
ctx.writeAndFlush(new Message0x02TENBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
|
||||
|
||||
|
||||
tag.setString ("WailaID", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass()));
|
||||
|
||||
WailaPacketHandler.INSTANCE.sendTo(new Message0x02TENBTData(tag), WailaPacketHandler.getPlayer(ctx));
|
||||
//ctx.writeAndFlush(new Message0x02TENBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
|
||||
}catch(Throwable e){
|
||||
WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package mcp.mobius.waila.network;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.channel.SimpleChannelInboundHandler;
|
||||
import mcp.mobius.waila.api.IWailaEntityProvider;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import mcp.mobius.waila.utils.AccessHelper;
|
||||
@@ -16,10 +17,9 @@ import net.minecraft.network.NetHandlerPlayServer;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelFutureListener;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.channel.SimpleChannelInboundHandler;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
public class Message0x03EntRequest extends SimpleChannelInboundHandler<Message0x03EntRequest> implements IWailaMessage {
|
||||
|
||||
@@ -76,12 +76,14 @@ public class Message0x03EntRequest extends SimpleChannelInboundHandler<Message0x
|
||||
EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity;
|
||||
|
||||
if (ModuleRegistrar.instance().hasNBTEntityProviders(entity)){
|
||||
for (IWailaEntityProvider provider : ModuleRegistrar.instance().getNBTEntityProviders(entity)){
|
||||
try{
|
||||
tag = provider.getNBTData(player, entity, tag, world);
|
||||
} catch (AbstractMethodError ame){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag);
|
||||
}
|
||||
for (List<IWailaEntityProvider> providersList : ModuleRegistrar.instance().getNBTEntityProviders(entity).values()){
|
||||
for (IWailaEntityProvider provider : providersList){
|
||||
try{
|
||||
tag = provider.getNBTData(player, entity, tag, world);
|
||||
} catch (AbstractMethodError ame){
|
||||
tag = AccessHelper.getNBTData(provider, entity, tag);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
@@ -91,7 +93,8 @@ public class Message0x03EntRequest extends SimpleChannelInboundHandler<Message0x
|
||||
|
||||
tag.setInteger("WailaEntityID", entity.getEntityId());
|
||||
|
||||
ctx.writeAndFlush(new Message0x04EntNBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
|
||||
WailaPacketHandler.INSTANCE.sendTo(new Message0x04EntNBTData(tag), WailaPacketHandler.getPlayer(ctx));
|
||||
//ctx.writeAndFlush(new Message0x04EntNBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
|
||||
}catch(Throwable e){
|
||||
WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
|
||||
}
|
||||
|
||||
@@ -1,24 +1,23 @@
|
||||
package mcp.mobius.waila.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelFutureListener;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.EnumMap;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.CompressedStreamTools;
|
||||
import net.minecraft.nbt.NBTSizeTracker;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.network.FMLEmbeddedChannel;
|
||||
import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec;
|
||||
import cpw.mods.fml.common.network.FMLOutboundHandler;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelFutureListener;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.CompressedStreamTools;
|
||||
import net.minecraft.nbt.NBTSizeTracker;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.NetHandlerPlayServer;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.EnumMap;
|
||||
|
||||
public enum WailaPacketHandler {
|
||||
INSTANCE;
|
||||
@@ -123,5 +122,9 @@ public enum WailaPacketHandler {
|
||||
int j = buffer.readShort();
|
||||
String s = new String(buffer.readBytes(j).array(), Charsets.UTF_8);
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
public static EntityPlayerMP getPlayer(ChannelHandlerContext ctx){
|
||||
return ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package mcp.mobius.waila.overlay;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
@@ -46,15 +48,17 @@ public class DecoratorRenderer {
|
||||
GL11.glDepthMask(false);
|
||||
|
||||
if (ModuleRegistrar.instance().hasBlockDecorator(block)){
|
||||
for (IWailaBlockDecorator decorator : ModuleRegistrar.instance().getBlockDecorators(block))
|
||||
try{
|
||||
GL11.glPushMatrix();
|
||||
decorator.decorateBlock(RayTracing.instance().getTargetStack(), accessor, ConfigHandler.instance());
|
||||
GL11.glPopMatrix();
|
||||
} catch (Throwable e){
|
||||
GL11.glPopMatrix();
|
||||
WailaExceptionHandler.handleErr(e, decorator.getClass().toString(), null);
|
||||
}
|
||||
for (List<IWailaBlockDecorator> decoratorsList : ModuleRegistrar.instance().getBlockDecorators(block).values()){
|
||||
for (IWailaBlockDecorator decorator : decoratorsList)
|
||||
try{
|
||||
GL11.glPushMatrix();
|
||||
decorator.decorateBlock(RayTracing.instance().getTargetStack(), accessor, ConfigHandler.instance());
|
||||
GL11.glPopMatrix();
|
||||
} catch (Throwable e){
|
||||
GL11.glPopMatrix();
|
||||
WailaExceptionHandler.handleErr(e, decorator.getClass().toString(), null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
|
||||
@@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11;
|
||||
import mcp.mobius.waila.api.IWailaTooltipRenderer;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorCommon;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import mcp.mobius.waila.utils.WailaExceptionHandler;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.Gui;
|
||||
@@ -42,6 +43,10 @@ public class DisplayUtil {
|
||||
width += renderer.getSize(renderMatcher.group("args").split(","), DataAccessorCommon.instance).width;
|
||||
}
|
||||
|
||||
Matcher iconMatcher = patternIcon.matcher(s);
|
||||
while (iconMatcher.find())
|
||||
width += 8;
|
||||
|
||||
width += fontRenderer.getStringWidth(stripSymbols(s));
|
||||
return width;
|
||||
}
|
||||
@@ -67,8 +72,13 @@ public class DisplayUtil {
|
||||
|
||||
public static void renderStack(int x, int y, ItemStack stack){
|
||||
enable3DRender();
|
||||
renderItem.renderItemAndEffectIntoGUI(fontRenderer, textureManager, stack, x, y);
|
||||
renderItem.renderItemOverlayIntoGUI(fontRenderer, textureManager, stack, x, y);
|
||||
try{
|
||||
renderItem.renderItemAndEffectIntoGUI(fontRenderer, textureManager, stack, x, y);
|
||||
renderItem.renderItemOverlayIntoGUI(fontRenderer, textureManager, stack, x, y);
|
||||
} catch (Exception e){
|
||||
String stackStr = stack != null ? stack.toString() : "NullStack";
|
||||
WailaExceptionHandler.handleErr(e, "renderStack | " + stackStr, null);
|
||||
}
|
||||
enable2DRender();
|
||||
}
|
||||
|
||||
@@ -163,4 +173,15 @@ public class DisplayUtil {
|
||||
return list.get(0);
|
||||
}
|
||||
|
||||
public static void renderIcon(int x, int y, int sx, int sy, IconUI icon){
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(Gui.icons);
|
||||
|
||||
if (icon == null)
|
||||
return;
|
||||
|
||||
if (icon.bu != -1)
|
||||
DisplayUtil.drawTexturedModalRect(x, y, icon.bu, icon.bv, sx, sy, icon.bsu, icon.bsv);
|
||||
DisplayUtil.drawTexturedModalRect(x, y, icon.u, icon.v, sx, sy, icon.su, icon.sv);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -31,7 +31,7 @@ public class OverlayRenderer {
|
||||
mc.theWorld != null &&
|
||||
Minecraft.isGuiEnabled() &&
|
||||
!mc.gameSettings.keyBindPlayerList.getIsKeyPressed() &&
|
||||
ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true) &&
|
||||
ConfigHandler.instance().showTooltip() &&
|
||||
RayTracing.instance().getTarget() != null))
|
||||
return;
|
||||
|
||||
@@ -40,7 +40,7 @@ public class OverlayRenderer {
|
||||
renderOverlay(WailaTickHandler.instance().tooltip);
|
||||
}
|
||||
|
||||
if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY)
|
||||
if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && ConfigHandler.instance().getConfig("general.showents"))
|
||||
{
|
||||
renderOverlay(WailaTickHandler.instance().tooltip);
|
||||
}
|
||||
@@ -125,15 +125,4 @@ public class OverlayRenderer {
|
||||
DisplayUtil.drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1);
|
||||
DisplayUtil.drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2);
|
||||
}
|
||||
|
||||
public static void renderIcon(int x, int y, int sx, int sy, IconUI icon){
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(Gui.icons);
|
||||
|
||||
if (icon == null)
|
||||
return;
|
||||
|
||||
if (icon.bu != -1)
|
||||
DisplayUtil.drawTexturedModalRect(x, y, icon.bu, icon.bv, sx, sy, icon.bsu, icon.bsv);
|
||||
DisplayUtil.drawTexturedModalRect(x, y, icon.u, icon.v, sx, sy, icon.su, icon.sv);
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,10 @@ package mcp.mobius.waila.overlay;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import mcp.mobius.waila.api.IWailaDataProvider;
|
||||
import mcp.mobius.waila.api.IWailaEntityProvider;
|
||||
import mcp.mobius.waila.api.impl.ConfigHandler;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorCommon;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
@@ -13,7 +16,9 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
@@ -112,8 +117,13 @@ public class RayTracing {
|
||||
if (this.target == null)
|
||||
return null;
|
||||
|
||||
if (ModuleRegistrar.instance().hasOverrideEntityProviders(this.target.entityHit))
|
||||
ents.add(ModuleRegistrar.instance().getOverrideEntityProviders(this.target.entityHit).get(0).getWailaOverride(DataAccessorCommon.instance, ConfigHandler.instance()));
|
||||
if (ModuleRegistrar.instance().hasOverrideEntityProviders(this.target.entityHit)){
|
||||
for (List<IWailaEntityProvider> listProviders : ModuleRegistrar.instance().getOverrideEntityProviders(this.target.entityHit).values()){
|
||||
for (IWailaEntityProvider provider : listProviders){
|
||||
ents.add(provider.getWailaOverride(DataAccessorCommon.instance, ConfigHandler.instance()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(ents.size() > 0)
|
||||
return ents.get(0);
|
||||
@@ -141,15 +151,34 @@ public class RayTracing {
|
||||
if (mouseoverBlock == null) return items;
|
||||
|
||||
if (ModuleRegistrar.instance().hasStackProviders(mouseoverBlock)){
|
||||
ItemStack providerStack = ModuleRegistrar.instance().getStackProviders(mouseoverBlock).get(0).getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance());
|
||||
if (providerStack != null)
|
||||
items.add(providerStack);
|
||||
for (List<IWailaDataProvider> providersList : ModuleRegistrar.instance().getStackProviders(mouseoverBlock).values()){
|
||||
for(IWailaDataProvider provider : providersList){
|
||||
ItemStack providerStack = provider.getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance());
|
||||
if (providerStack != null){
|
||||
|
||||
if (providerStack.getItem() == null)
|
||||
return new ArrayList<ItemStack>();
|
||||
|
||||
items.add(providerStack);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (tileEntity != null && ModuleRegistrar.instance().hasStackProviders(tileEntity)){
|
||||
ItemStack providerStack = ModuleRegistrar.instance().getStackProviders(tileEntity).get(0).getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance());
|
||||
if (providerStack != null)
|
||||
items.add(providerStack);
|
||||
for (List<IWailaDataProvider> providersList : ModuleRegistrar.instance().getStackProviders(tileEntity).values()){
|
||||
|
||||
for(IWailaDataProvider provider : providersList){
|
||||
ItemStack providerStack = provider.getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance());
|
||||
if (providerStack != null){
|
||||
|
||||
if (providerStack.getItem() == null)
|
||||
return new ArrayList<ItemStack>();
|
||||
|
||||
items.add(providerStack);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(items.size() > 0)
|
||||
|
||||
@@ -20,6 +20,7 @@ import mcp.mobius.waila.api.impl.DataAccessorCommon;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderIcon;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderString;
|
||||
import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderTrueTyper;
|
||||
import mcp.mobius.waila.utils.Constants;
|
||||
import mcp.mobius.waila.utils.WailaExceptionHandler;
|
||||
import static mcp.mobius.waila.api.SpecialChars.*;
|
||||
@@ -106,7 +107,7 @@ public class Tooltip {
|
||||
|
||||
for (String s : textData){
|
||||
|
||||
ArrayList<String> line = new ArrayList(Arrays.asList(patternTab.split(s)));
|
||||
ArrayList<String> line = new ArrayList<String>(Arrays.asList(patternTab.split(s)));
|
||||
ArrayList<Integer> size = new ArrayList<Integer>();
|
||||
for (String ss : line)
|
||||
size.add(DisplayUtil.getDisplayWidth(ss));
|
||||
@@ -174,6 +175,7 @@ public class Tooltip {
|
||||
offsetX += (columnsWidth.get(c) - DisplayUtil.getDisplayWidth(currentLine.substring(lineMatcher.start()))) / 2;
|
||||
|
||||
renderable = new Renderable(new TTRenderString(DisplayUtil.stripWailaSymbols(cs)), new Point(offsetX, offsetY));
|
||||
//renderable = new Renderable(new TTRenderTrueTyper(DisplayUtil.stripWailaSymbols(cs)), new Point(offsetX, offsetY));
|
||||
this.elements.add(renderable);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.util.List;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import mcp.mobius.waila.api.ITaggedList;
|
||||
import mcp.mobius.waila.api.impl.ConfigHandler;
|
||||
import mcp.mobius.waila.api.impl.DataAccessorCommon;
|
||||
import mcp.mobius.waila.api.impl.MetaDataProvider;
|
||||
@@ -58,8 +59,10 @@ public class WailaTickHandler{
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void tickClient(TickEvent.ClientTickEvent event) {
|
||||
|
||||
if (!Keyboard.isKeyDown(KeyEvent.key_show.getKeyCode()) && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)){
|
||||
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false);
|
||||
if (!Keyboard.isKeyDown(KeyEvent.key_show.getKeyCode()) &&
|
||||
!ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false) &&
|
||||
ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false)){
|
||||
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false);
|
||||
}
|
||||
|
||||
|
||||
@@ -75,10 +78,10 @@ public class WailaTickHandler{
|
||||
ItemStack targetStack = RayTracing.instance().getTargetStack(); // Here we get either the proper stack or the override
|
||||
|
||||
if (targetStack != null){
|
||||
this.currenttip.clear();
|
||||
this.currenttipHead.clear();
|
||||
this.currenttipBody.clear();
|
||||
this.currenttipTail.clear();
|
||||
this.currenttip = new TipList<String, String>();
|
||||
this.currenttipHead = new TipList<String, String>();
|
||||
this.currenttipBody = new TipList<String, String>();
|
||||
this.currenttipTail = new TipList<String, String>();
|
||||
|
||||
|
||||
//this.identifiedHighlight = handler.identifyHighlight(world, player, target);
|
||||
@@ -105,10 +108,10 @@ public class WailaTickHandler{
|
||||
Entity targetEnt = RayTracing.instance().getTargetEntity(); // This need to be replaced by the override check.
|
||||
|
||||
if (targetEnt != null){
|
||||
this.currenttip.clear();
|
||||
this.currenttipHead.clear();
|
||||
this.currenttipBody.clear();
|
||||
this.currenttipTail.clear();
|
||||
this.currenttip = new TipList<String, String>();
|
||||
this.currenttipHead = new TipList<String, String>();
|
||||
this.currenttipBody = new TipList<String, String>();
|
||||
this.currenttipTail = new TipList<String, String>();
|
||||
|
||||
this.currenttipHead = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipHead, Layout.HEADER);
|
||||
this.currenttipBody = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipBody, Layout.BODY);
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package mcp.mobius.waila.overlay.tooltiprenderers;
|
||||
|
||||
import static mcp.mobius.waila.api.SpecialChars.WailaIcon;
|
||||
import static mcp.mobius.waila.api.SpecialChars.WailaStyle;
|
||||
|
||||
import java.awt.Dimension;
|
||||
|
||||
import net.minecraft.util.MathHelper;
|
||||
import mcp.mobius.waila.api.IWailaCommonAccessor;
|
||||
import mcp.mobius.waila.api.IWailaTooltipRenderer;
|
||||
import mcp.mobius.waila.overlay.DisplayUtil;
|
||||
import mcp.mobius.waila.overlay.IconUI;
|
||||
import mcp.mobius.waila.overlay.OverlayRenderer;
|
||||
|
||||
/**
|
||||
* Custom renderer for health bars.
|
||||
* Syntax : {waila.health, nheartperline, health, maxhealth}
|
||||
*
|
||||
*/
|
||||
public class TTRenderHealth implements IWailaTooltipRenderer {
|
||||
|
||||
@Override
|
||||
public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
|
||||
float maxhearts = Float.valueOf(params[0]);
|
||||
float health = Float.valueOf(params[1]);
|
||||
float maxhealth = Float.valueOf(params[2]);
|
||||
|
||||
int heartsPerLine = (int)(Math.min(maxhearts, Math.ceil(maxhealth)));
|
||||
int nlines = (int)(Math.ceil(maxhealth/maxhearts));
|
||||
|
||||
return new Dimension(8 * heartsPerLine, 10 * nlines - 2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(String[] params, IWailaCommonAccessor accessor) {
|
||||
float maxhearts = Float.valueOf(params[0]);
|
||||
float health = Float.valueOf(params[1]);
|
||||
float maxhealth = Float.valueOf(params[2]);
|
||||
|
||||
int nhearts = MathHelper.ceiling_float_int(maxhealth);
|
||||
int heartsPerLine = (int)(Math.min(maxhearts, Math.ceil(maxhealth)));
|
||||
|
||||
int offsetX = 0;
|
||||
int offsetY = 0;
|
||||
|
||||
for (int iheart = 1; iheart <= nhearts; iheart++){
|
||||
|
||||
|
||||
if (iheart <= MathHelper.floor_float(health)){
|
||||
DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.HEART);
|
||||
offsetX += 8;
|
||||
}
|
||||
|
||||
if ((iheart > health) && (iheart < health + 1)){
|
||||
DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.HHEART);
|
||||
offsetX += 8;
|
||||
}
|
||||
|
||||
if (iheart >= health + 1){
|
||||
DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.EHEART);
|
||||
offsetX += 8;
|
||||
}
|
||||
|
||||
if (iheart%heartsPerLine == 0){
|
||||
offsetY += 10;
|
||||
offsetX = 0;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import org.lwjgl.opengl.GL11;
|
||||
import mcp.mobius.waila.api.IWailaCommonAccessor;
|
||||
import mcp.mobius.waila.api.IWailaDataAccessor;
|
||||
import mcp.mobius.waila.api.IWailaTooltipRenderer;
|
||||
import mcp.mobius.waila.overlay.DisplayUtil;
|
||||
import mcp.mobius.waila.overlay.OverlayRenderer;
|
||||
import mcp.mobius.waila.overlay.IconUI;
|
||||
|
||||
@@ -29,7 +30,7 @@ public class TTRenderIcon implements IWailaTooltipRenderer {
|
||||
|
||||
@Override
|
||||
public void draw(String[] params, IWailaCommonAccessor accessor) {
|
||||
OverlayRenderer.renderIcon(0, 0, IconSize, IconSize, IconUI.bySymbol(WailaStyle + WailaIcon + type));
|
||||
DisplayUtil.renderIcon(0, 0, IconSize, IconSize, IconUI.bySymbol(WailaStyle + WailaIcon + type));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package mcp.mobius.waila.overlay.tooltiprenderers;
|
||||
|
||||
import java.awt.Dimension;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import mcp.mobius.waila.api.IWailaCommonAccessor;
|
||||
import mcp.mobius.waila.api.IWailaTooltipRenderer;
|
||||
import mcp.mobius.waila.overlay.DisplayUtil;
|
||||
|
||||
public class TTRenderProgressBar implements IWailaTooltipRenderer{
|
||||
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
ResourceLocation texture = new ResourceLocation("waila", "textures/sprites.png");
|
||||
|
||||
@Override
|
||||
public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
|
||||
return new Dimension(32,16);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(String[] params, IWailaCommonAccessor accessor) {
|
||||
int currentValue = Integer.valueOf(params[0]);
|
||||
int maxValue = Integer.valueOf(params[1]);
|
||||
|
||||
int progress = (currentValue * 28) / maxValue;
|
||||
|
||||
this.mc.getTextureManager().bindTexture(texture);
|
||||
|
||||
DisplayUtil.drawTexturedModalRect(4, 0, 4, 16, 28, 16, 28, 16);
|
||||
DisplayUtil.drawTexturedModalRect(4, 0, 4, 0, progress + 1, 16, progress + 1, 16);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package mcp.mobius.waila.overlay.tooltiprenderers;
|
||||
|
||||
import java.awt.Dimension;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import mcp.mobius.waila.api.IWailaCommonAccessor;
|
||||
import mcp.mobius.waila.api.IWailaTooltipRenderer;
|
||||
import mcp.mobius.waila.overlay.DisplayUtil;
|
||||
|
||||
public class TTRenderStack implements IWailaTooltipRenderer{
|
||||
|
||||
@Override
|
||||
public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
|
||||
return new Dimension(16,16);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(String[] params, IWailaCommonAccessor accessor) {
|
||||
int type = Integer.valueOf(params[0]); //0 for block, 1 for item
|
||||
String name = params[1]; //Fully qualified name
|
||||
int amount = Integer.valueOf(params[2]);
|
||||
int meta = Integer.valueOf(params[3]);
|
||||
|
||||
ItemStack stack = null;
|
||||
if (type == 0)
|
||||
stack = new ItemStack((Block)Block.blockRegistry.getObject(name), amount, meta);
|
||||
if (type == 1)
|
||||
stack = new ItemStack((Item)Item.itemRegistry.getObject(name), amount, meta);
|
||||
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
DisplayUtil.renderStack(0, 0, stack);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,10 +1,13 @@
|
||||
package mcp.mobius.waila.overlay.tooltiprenderers;
|
||||
package mcp.mobius.waila.overlay.tooltiprenderers;
|
||||
|
||||
import java.awt.Dimension;
|
||||
|
||||
import mcp.mobius.waila.Waila;
|
||||
import mcp.mobius.waila.api.IWailaCommonAccessor;
|
||||
import mcp.mobius.waila.api.IWailaDataAccessor;
|
||||
import mcp.mobius.waila.api.IWailaTooltipRenderer;
|
||||
import mcp.mobius.waila.gui.truetyper.FontHelper;
|
||||
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
|
||||
import mcp.mobius.waila.overlay.DisplayUtil;
|
||||
import mcp.mobius.waila.overlay.OverlayConfig;
|
||||
|
||||
@@ -25,7 +28,7 @@ public class TTRenderString implements IWailaTooltipRenderer{
|
||||
|
||||
@Override
|
||||
public void draw(String[] params, IWailaCommonAccessor accessor) {
|
||||
DisplayUtil.drawString(data, 0, 0, OverlayConfig.fontcolor, true);
|
||||
DisplayUtil.drawString(data, 0, 0, OverlayConfig.fontcolor, true);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package mcp.mobius.waila.overlay.tooltiprenderers;
|
||||
|
||||
import java.awt.Dimension;
|
||||
|
||||
import mcp.mobius.waila.Waila;
|
||||
import mcp.mobius.waila.api.IWailaCommonAccessor;
|
||||
import mcp.mobius.waila.api.IWailaTooltipRenderer;
|
||||
import mcp.mobius.waila.gui.truetyper.FontHelper;
|
||||
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
|
||||
import mcp.mobius.waila.overlay.DisplayUtil;
|
||||
|
||||
public class TTRenderTrueTyper implements IWailaTooltipRenderer{
|
||||
|
||||
final String data;
|
||||
final Dimension size;
|
||||
|
||||
public TTRenderTrueTyper(String data){
|
||||
this.data = data;
|
||||
this.size = new Dimension(DisplayUtil.getDisplayWidth(data), data.equals("") ? 0 : (int)((TrueTypeFont)Waila.proxy.getFont()).getHeight()/2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
|
||||
return size;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(String[] params, IWailaCommonAccessor accessor) {
|
||||
FontHelper.drawString(data, 0f, 0f, (TrueTypeFont)Waila.proxy.getFont(), 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
package mcp.mobius.waila.server;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import mcp.mobius.waila.Waila;
|
||||
import mcp.mobius.waila.addons.agriculture.AgricultureModule;
|
||||
@@ -19,14 +18,18 @@ import mcp.mobius.waila.addons.railcraft.RailcraftModule;
|
||||
import mcp.mobius.waila.addons.statues.StatuesModule;
|
||||
import mcp.mobius.waila.addons.stevescarts.StevesCartsModule;
|
||||
import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule;
|
||||
import mcp.mobius.waila.addons.thermaldynamics.ThermalDynamicsModule;
|
||||
import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule;
|
||||
import mcp.mobius.waila.addons.twilightforest.TwilightForestModule;
|
||||
import mcp.mobius.waila.addons.vanillamc.HUDHandlerFurnace;
|
||||
import mcp.mobius.waila.addons.vanillamc.HUDHandlerVanilla;
|
||||
import mcp.mobius.waila.api.IWailaRegistrar;
|
||||
import mcp.mobius.waila.api.impl.ModuleRegistrar;
|
||||
import mcp.mobius.waila.handlers.DecoratorFMP;
|
||||
import mcp.mobius.waila.handlers.HUDHandlerFMP;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
public class ProxyServer {
|
||||
|
||||
public ProxyServer() {}
|
||||
@@ -36,6 +39,7 @@ public class ProxyServer {
|
||||
public void registerMods(){
|
||||
|
||||
HUDHandlerVanilla.register();
|
||||
HUDHandlerFurnace.register();
|
||||
|
||||
/* BUILDCRAFT */
|
||||
BCModule.register();
|
||||
@@ -57,6 +61,9 @@ public class ProxyServer {
|
||||
|
||||
/* Thermal Expansion */
|
||||
ThermalExpansionModule.register();
|
||||
|
||||
/* Thermal Dynamics */
|
||||
ThermalDynamicsModule.register();
|
||||
|
||||
/* ETB */
|
||||
ETBModule.register();
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
screen.button.waila=Waila
|
||||
screen.button.modules=Moduly
|
||||
screen.label.scale=Mìøítko
|
||||
screen.label.dragtuto=Chytni HUD pro nastavení jeho pozice.
|
||||
|
||||
screen.button.default=Defaultní
|
||||
screen.button.cancel=Zrušit
|
||||
screen.button.ok=Ok
|
||||
screen.button.yes=Ano
|
||||
screen.button.no=Ne
|
||||
screen.button.back=Zpìt
|
||||
screen.button.hidden=Skrytý
|
||||
screen.button.visible=Viditelný
|
||||
screen.button.maintained=Spravované
|
||||
screen.button.toggled=Pøepnuté
|
||||
|
||||
choice.showhidewaila=Zobrazit/Skrýt Wailu
|
||||
choice.showhideidmeta=Zobrazit ID:Metadata
|
||||
choice.toggledmaintained=Pøepnuté/Spravované
|
||||
choice.showliquids=Tekutiny
|
||||
choice.shifttoggledblock=Pliž se pro pøepnutí blokù
|
||||
choice.shifttoggledents=Pliž se pro pøepnutí entit
|
||||
screen.button.configureaspect=Nastavení vzhledu...
|
||||
|
||||
enchant.title.name=Jméno
|
||||
enchant.title.minlvl=Minimální lvl
|
||||
enchant.title.maxlvl=Maximální lvl
|
||||
enchant.title.weight=Hmotnost
|
||||
enchant.label.enchantability=Oèarovatelnost
|
||||
|
||||
waila.keybind.wailaconfig=[Waila] Nastavení obrazu
|
||||
waila.keybind.wailadisplay=[Waila] Zobrazit/Skrýt
|
||||
waila.keybind.liquid=[Waila] Zobrazit tekutiny
|
||||
waila.keybind.recipe=[Waila] Zobrazit recept
|
||||
waila.keybind.usage=[Waila] Zobrazit použití
|
||||
waila.keybind.testing=[Waila] Testování
|
||||
|
||||
client.msg.norecipe=Nenalezen žádný recept.
|
||||
client.msg.nousage=Nenalezeno žádné využití.
|
||||
|
||||
hud.msg.none=<Nic>
|
||||
hud.msg.empty=<Prázdný>
|
||||
hud.msg.output=Výstup
|
||||
hud.msg.input=Vstup
|
||||
hud.msg.out=Ven
|
||||
hud.msg.in=Dovnitø
|
||||
hud.msg.power=Energie
|
||||
hud.msg.storage=Úložištì
|
||||
hud.msg.stored=Uloženo
|
||||
hud.msg.any=Jakýkoliv
|
||||
hud.msg.mode=Mód
|
||||
hud.msg.maxpower=Maximální Energie
|
||||
hud.msg.trigger=Spouštìè
|
||||
hud.msg.maxio=Maximální propustnost
|
||||
|
||||
hud.msg.send=Odeslat
|
||||
hud.msg.recv=Obdržet
|
||||
hud.msg.item=Pøedmìt
|
||||
hud.msg.fluid=Tekutina
|
||||
hud.msg.energ=Energie
|
||||
hud.msg.frequency=Frekvence
|
||||
|
||||
hud.msg.owner=Vlastník
|
||||
hud.msg.public=Veøejné
|
||||
hud.msg.restricted=Omezené
|
||||
hud.msg.private=Soukromé
|
||||
|
||||
hud.msg.white=Bílá
|
||||
hud.msg.orange=Oranžová
|
||||
hud.msg.magenta=Purpurová
|
||||
hud.msg.lblue=Svìtle modrá
|
||||
hud.msg.yellow=Žlutá
|
||||
hud.msg.lime=Svìtle zelená
|
||||
hud.msg.pink=Rùžová
|
||||
hud.msg.gray=Šedá
|
||||
hud.msg.lgray=Svìtle šedá
|
||||
hud.msg.cyan=Tyrkysová
|
||||
hud.msg.purple=Fialová
|
||||
hud.msg.blue=Modrá
|
||||
hud.msg.brown=Hnìdá
|
||||
hud.msg.green=Zelená
|
||||
hud.msg.red=Èervená
|
||||
hud.msg.black=Èerná
|
||||
|
||||
hud.msg.growth=Rùst
|
||||
hud.msg.mature=Stáøí
|
||||
hud.msg.off=Vypnuto
|
||||
hud.msg.on=Zapnuto
|
||||
hud.msg.state=Stav
|
||||
hud.msg.delay=Prodleva
|
||||
hud.msg.comparator=Porovnávaè
|
||||
hud.msg.substractor=Substraktor
|
||||
hud.msg.record=Záznam
|
||||
|
||||
hud.msg.offers=Poskytuje
|
||||
hud.msg.demands=Požaduje
|
||||
|
||||
option.appeng.monitorcontent=Obsah monitoru
|
||||
option.bb.content=Obsah barelu
|
||||
option.bc.tankamount=Množství tekutiny
|
||||
option.bc.tanktype=Typ tekutiny
|
||||
option.enderstorage.colors=Barvy
|
||||
option.ic2.inputeumach=Maximální pøíjem EU [Stroje]
|
||||
option.ic2.inputeuother=Maximální pøíjem EU [Ostatní]
|
||||
option.ic2.inputeu=Maximální pøijem EU
|
||||
option.ic2.outputeu=Maximální výstup EU
|
||||
option.ic2.storage=Uloženo energie
|
||||
option.ic2.consump=Zobrazit spotøebu
|
||||
option.ic2.tradeomat=Zobrazit Trade-O-Mat požadavek
|
||||
option.thaumcraft.storedvis=Úložištì kondenzátoru
|
||||
option.thermalexpansion.energyhandler=Zobrazit úložištì RF
|
||||
option.thermalexpansion.energycell=Zobrazit ECell VSTUP/VÝSTUP
|
||||
option.thermalexpansion.fluidtype=Zobrazit typ tekutiny
|
||||
option.thermalexpansion.fluidamount=Zobrazit množství tekutiny
|
||||
option.thermalexpansion.tankmode=Zobrazit mód nádrže
|
||||
option.thermalexpansion.tesssendrecv=Tesseract mode
|
||||
option.thermalexpansion.tessfreq=Frekvence Teseraktu
|
||||
option.thermalexpansion.owner=Zobrazit majitele
|
||||
option.thermalexpansion.conditemmode=Zobrazit mód Itemduktu
|
||||
option.vanilla.spawntype=Typ spawneru
|
||||
option.vanilla.growthvalue=Hodnota rùstu
|
||||
option.vanilla.leverstate=Stav páky
|
||||
option.vanilla.repeater=Prodleva opakovaèe
|
||||
option.vanilla.comparator=Mód porovnávaèe
|
||||
option.vanilla.redstone=Ruditová energie
|
||||
option.vanilla.jukebox=Jukeboxový disk
|
||||
option.vanilla.silverfish=Skrýt rybenku
|
||||
option.etb.displaydata=Zobrazit data slotu
|
||||
option.enderio.inout=Zobrazit vstup/výstup
|
||||
option.enderio.storage=Zobrazit uskladnìné MJ
|
||||
option.enderio.owner=Zobrazit majitele bloku
|
||||
option.enderio.channel=Zobrazit kanál nadkrychle
|
||||
option.bcapi.storage=Zobrazit uskladnìné MJ
|
||||
option.bcapi.consump=Zobrazit maximální energii
|
||||
option.bcapi.trigger=Zobrazit spouštìjící se energii
|
||||
option.pr.showio=Zobrazit IO brány
|
||||
option.pr.showdata=Zobrazit data bran
|
||||
option.extrautilities.fluidamount=Zobrazit množství tekutin
|
||||
option.openblocks.fluidamount=Zobrazit množství tekutin
|
||||
option.railcraft.fluidamount=Zobrazit množství tekutin
|
||||
option.secretrooms.hide=Skrýt camo bloky
|
||||
option.carpenters.hide=Skrýt camo bloky
|
||||
option.stevescarts.showall=Zobrazit data
|
||||
option.stevescarts.colorblind=Barevný mód
|
||||
option.stevescarts.shifttoggle=Shift pro pøepnutí
|
||||
option.general.showhp=Zobrazit zdraví entit
|
||||
option.general.showcrop=Zobrazit rùst plodin
|
||||
option.thaumcraft.aspects=Zobrazit aspekty
|
||||
@@ -143,6 +143,9 @@ option.carpenters.hide=Hide camo blocks
|
||||
option.stevescarts.showall=Show data
|
||||
option.stevescarts.colorblind=Colorblind mode
|
||||
option.stevescarts.shifttoggle=Shift toggle
|
||||
option.general.showents=Show entities
|
||||
option.general.showhp=Show entities health
|
||||
option.general.showcrop=Show crop growth
|
||||
option.thaumcraft.aspects=Show aspects
|
||||
option.thaumcraft.aspects=Show aspects
|
||||
|
||||
nei.options.keys.showenchant=Show enchanting values
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 606 B |
Reference in new issue
Block a user