Compare commits

...
11 Commits
86 changed files with 1439 additions and 1135 deletions

No files matched your search

@@ -2,9 +2,6 @@ package mcp.mobius.waila;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.google.common.eventbus.EventBus;
@@ -12,37 +9,24 @@ import com.google.common.eventbus.Subscribe;
import mcp.mobius.waila.api.IWailaRegistrar;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.api.impl.MetaDataProvider;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import mcp.mobius.waila.client.WailaClientEventHandler;
import mcp.mobius.waila.network.WailaConnectionHandler;
import mcp.mobius.waila.network.WailaPacketHandler;
import mcp.mobius.waila.cbcore.LangUtil;
import mcp.mobius.waila.events.DecoratorRenderer;
import mcp.mobius.waila.events.KeyHandler;
import mcp.mobius.waila.events.NetworkHandler;
import mcp.mobius.waila.events.TickHandler;
import mcp.mobius.waila.server.ProxyServer;
import mcp.mobius.waila.tools.ModIdentification;
import mcp.mobius.waila.tools.Reflect;
import net.minecraft.client.resources.I18n;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.oredict.OreDictionary;
import codechicken.core.CommonUtils;
import codechicken.lib.lang.LangUtil;
import cpw.mods.fml.client.registry.KeyBindingRegistry;
import cpw.mods.fml.client.registry.KeyBindingRegistry.KeyHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLModContainer;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.IMCCallback;
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.Mod.PostInit;
import cpw.mods.fml.common.Mod.PreInit;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
@@ -50,19 +34,17 @@ import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.ItemData;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
@Mod(modid="Waila", name="Waila", version="1.4.5", dependencies="required-after:NotEnoughItems")
@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class,
packetHandler = WailaPacketHandler.class, versionBounds="[1.3.0,)")
//@Mod(modid="Waila", name="Waila", version="1.4.5", dependencies="required-after:NotEnoughItems")
@Mod(modid="Waila", name="Waila", version="1.4.5_1.7.2")
public class mod_Waila {
public class Waila {
// The instance of your mod that Forge uses.
@Instance("Waila")
public static mod_Waila instance;
public static Waila instance;
@SidedProxy(clientSide="mcp.mobius.waila.client.ProxyClient", serverSide="mcp.mobius.waila.server.ProxyServer")
public static ProxyServer proxy;
@@ -80,6 +62,8 @@ public class mod_Waila {
public static int fontcolor;
public static float scale;
//public SimpleNetworkWrapper network = new SimpleNetworkWrapper("Waila");
/* INIT SEQUENCE */
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
@@ -107,7 +91,7 @@ public class mod_Waila {
updateColors();
MinecraftForge.EVENT_BUS.register(new WailaClientEventHandler());
}
@EventHandler
@@ -118,6 +102,16 @@ public class mod_Waila {
EventBus FMLbus = (EventBus) eBus.get(FMLCommonHandler.instance().findContainerFor(this));
FMLbus.register(this);
} catch (Throwable t) {}
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){
MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
FMLCommonHandler.instance().bus().register(new KeyHandler());
FMLCommonHandler.instance().bus().register(TickHandler.instance());
}
FMLCommonHandler.instance().bus().register(new NetworkHandler());
//network.registerMessage(ServerPingHandler.class, ServerPingMessage.class, 0, Side.CLIENT);
}
@EventHandler
@@ -125,12 +119,13 @@ public class mod_Waila {
proxy.registerHandlers();
ModIdentification.init();
/*
if (ConfigHandler.instance().getConfig(Constants.CFG_WAILA_KEYBIND)){
for (String key: ModIdentification.keyhandlerStrings.keySet()){
String orig = I18n.getString(key);
if (orig.equals(key))
orig = LanguageRegistry.instance().getStringLocalization(key);
//String orig = I18n.getString(key);
//if (orig.equals(key))
String orig = LanguageRegistry.instance().getStringLocalization(key);
if (orig.equals(key))
orig = LangUtil.translateG(key);
if (orig.isEmpty())
@@ -157,6 +152,7 @@ public class mod_Waila {
LanguageRegistry.instance().addStringLocalization(key, modif);
}
}
*/
}
@@ -180,15 +176,15 @@ public class mod_Waila {
if (imcMessage.key.equalsIgnoreCase("addconfig")){
String[] params = imcMessage.getStringValue().split("\\$\\$");
if (params.length != 3){
mod_Waila.log.warning(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));
Waila.log.warning(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));
continue;
}
mod_Waila.log.info(String.format("Receiving config request from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));
Waila.log.info(String.format("Receiving config request from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));
ConfigHandler.instance().addConfig(params[0], params[1], params[2]);
}
if (imcMessage.key.equalsIgnoreCase("register")){
mod_Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue()));
Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue()));
this.callbackRegistration(imcMessage.getStringValue(), imcMessage.getSender());
}
}
@@ -199,21 +195,21 @@ public class mod_Waila {
String methodName = splitName[splitName.length-1];
String className = method.substring(0, method.length()-methodName.length()-1);
mod_Waila.log.info(String.format("Trying to reflect %s %s", className, methodName));
Waila.log.info(String.format("Trying to reflect %s %s", className, methodName));
try{
Class reflectClass = Class.forName(className);
Method reflectMethod = reflectClass.getDeclaredMethod(methodName, IWailaRegistrar.class);
reflectMethod.invoke(null, (IWailaRegistrar)ModuleRegistrar.instance());
mod_Waila.log.info(String.format("Success in registering %s", modname));
Waila.log.info(String.format("Success in registering %s", modname));
} catch (ClassNotFoundException e){
mod_Waila.log.warning(String.format("Could not find class %s", className));
Waila.log.warning(String.format("Could not find class %s", className));
} catch (NoSuchMethodException e){
mod_Waila.log.warning(String.format("Could not find method %s", methodName));
Waila.log.warning(String.format("Could not find method %s", methodName));
} catch (Exception e){
mod_Waila.log.warning(String.format("Exception while trying to access the method : %s", e.toString()));
Waila.log.warning(String.format("Exception while trying to access the method : %s", e.toString()));
}
}
+2 -2
View File
@@ -15,11 +15,11 @@ public class WailaExceptionHandler {
errs.add(className);
for (StackTraceElement elem : e.getStackTrace()){
mod_Waila.log.log(Level.WARNING, String.format("%s.%s:%s",elem.getClassName(), elem.getMethodName(), elem.getLineNumber()));
Waila.log.log(Level.WARNING, String.format("%s.%s:%s",elem.getClassName(), elem.getMethodName(), elem.getLineNumber()));
if (elem.getClassName().contains("waila")) break;
}
mod_Waila.log.log(Level.WARNING, String.format("Catched unhandled exception : [%s] %s",className,e));
Waila.log.log(Level.WARNING, String.format("Catched unhandled exception : [%s] %s",className,e));
}
if (currenttip != null)
currenttip.add("<ERROR>");
@@ -4,9 +4,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import codechicken.lib.lang.LangUtil;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.mod_Waila;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class AppEngModule {
@@ -26,17 +25,17 @@ public class AppEngModule {
IAEItemStack_getItemStack = IAEItemStack.getMethod("getItemStack");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[AppEng] Class not found. " + e);
Waila.log.log(Level.WARNING, "[AppEng] Class not found. " + e);
return;
} catch (SecurityException e) {
mod_Waila.log.log(Level.WARNING, "[AppEng] Security Exception. " + e);
Waila.log.log(Level.WARNING, "[AppEng] Security Exception. " + e);
return;
} catch (NoSuchMethodException e) {
mod_Waila.log.log(Level.WARNING, "[AppEng] Method not found. " + e);
Waila.log.log(Level.WARNING, "[AppEng] Method not found. " + e);
return;
}
mod_Waila.log.log(Level.INFO, "AppEng mod found.");
Waila.log.log(Level.INFO, "AppEng mod found.");
ModuleRegistrar.instance().addConfig("Applied Energetic", "appeng.monitorcontent");
ModuleRegistrar.instance().registerBodyProvider(new HUDAppEngMonitor(), TileStorageMonitor);
}
@@ -3,12 +3,12 @@ package mcp.mobius.waila.addons.appeng;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDAppEngMonitor implements IWailaDataProvider {
@@ -1,41 +0,0 @@
package mcp.mobius.waila.addons.betterbarrels;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import codechicken.lib.lang.LangUtil;
import codechicken.nei.api.API;
import codechicken.nei.api.ItemInfo;
public class BetterBarrelsModule {
public static Class TileEntityBarrel = null;
public static Class IBarrelStorage = null;
public static Field TileEntityBarrel_Storage = null;
public static Method IBarrelStorage_getItem = null;
public static void register(){
try{
TileEntityBarrel = Class.forName("mcp.mobius.betterbarrels.common.TileEntityBarrel");
IBarrelStorage = Class.forName("mcp.mobius.betterbarrels.common.IBarrelStorage");
TileEntityBarrel_Storage = TileEntityBarrel.getField("storage");
IBarrelStorage_getItem = IBarrelStorage.getMethod("getItem");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[BB] BetterBarrel classes not found.");
} catch (NoSuchFieldException e){
mod_Waila.log.log(Level.WARNING, "[BB] Storage field not found.");
} catch (NoSuchMethodException e){
mod_Waila.log.log(Level.WARNING, "[BB] getItem() not found.");
}
if (IBarrelStorage_getItem != null){
mod_Waila.log.log(Level.INFO, "Waila module BetterBarrel succefully hooked.");
ModuleRegistrar.instance().addConfig("BetterBarrels", "bb.content");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBBContent(), TileEntityBarrel);
}
}
}
@@ -1,64 +0,0 @@
package mcp.mobius.waila.addons.betterbarrels;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.List;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
//import mcp.mobius.betterbarrels.common.TileEntityBarrel;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import codechicken.lib.lang.LangUtil;
import codechicken.nei.api.API;
import codechicken.nei.api.ItemInfo;
import codechicken.nei.api.ItemInfo.Layout;
import codechicken.nei.api.IHighlightHandler;
public class HUDHandlerBBContent 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) {
TileEntity entity = accessor.getTileEntity();
if (!config.getConfig("bb.content")) return currenttip;
if ((entity != null) && (BetterBarrelsModule.TileEntityBarrel.isInstance(entity))){
ItemStack stack = null;
try {
stack = (ItemStack) BetterBarrelsModule.IBarrelStorage_getItem.invoke(BetterBarrelsModule.TileEntityBarrel_Storage.get(entity));
} catch (Exception e){
mod_Waila.log.log(Level.SEVERE, "[BB] Unhandled exception trying to access a barrel storage for display !.\n" + String.valueOf(e));
currenttip.add("<ERROR!>");
return currenttip;
}
if (stack != null){
currenttip.add(stack.getDisplayName());
} else {
currenttip.add(LangUtil.translateG("hud.msg.empty"));
}
}
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
@@ -3,9 +3,9 @@ package mcp.mobius.waila.addons.buildcraft;
import java.lang.reflect.Method;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
public class BCModule {
@@ -20,9 +20,9 @@ public class BCModule {
public static void register(){
try {
Class ModBuildcraftFactory = Class.forName("buildcraft.BuildCraftFactory");
mod_Waila.log.log(Level.INFO, "Buildcraft|Factory mod found.");
Waila.log.log(Level.INFO, "Buildcraft|Factory mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "Buildcraft|Factory mod not found. Skipping.");
Waila.log.log(Level.INFO, "Buildcraft|Factory mod not found. Skipping.");
return;
}
@@ -31,10 +31,10 @@ public class BCModule {
TileTank_getTankInfo = TileTank.getMethod("getTankInfo", ForgeDirection.class);
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[BC] Class not found. " + e);
Waila.log.log(Level.WARNING, "[BC] Class not found. " + e);
return;
} catch (NoSuchMethodException e){
mod_Waila.log.log(Level.WARNING, "[BC] Method not found." + e);
Waila.log.log(Level.WARNING, "[BC] Method not found." + e);
return;
}
@@ -4,8 +4,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.mod_Waila;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class BCPowerAPIModule {
@@ -30,9 +30,9 @@ public class BCPowerAPIModule {
public static void register(){
try{
Class ModClass = Class.forName("buildcraft.api.power.IPowerReceptor");
mod_Waila.log.log(Level.INFO, "Buildcraft Power API found.");
Waila.log.log(Level.INFO, "Buildcraft Power API found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[Buildcraft Power API] Buildcraft Power API mod not found.");
Waila.log.log(Level.INFO, "[Buildcraft Power API] Buildcraft Power API mod not found.");
return;
}
@@ -56,16 +56,16 @@ public class BCPowerAPIModule {
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
return;
} catch (NoSuchMethodException e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
return;
// } catch (NoSuchFieldException e){
// mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
// return;
} catch (Exception e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
return;
}
@@ -3,27 +3,21 @@ package mcp.mobius.waila.addons.buildcraft;
import java.util.List;
import java.util.logging.Level;
//import buildcraft.factory.TileTank;
import codechicken.lib.lang.LangUtil;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.liquids.ILiquidTank;
import net.minecraftforge.liquids.LiquidStack;
//import net.minecraftforge.liquids.ILiquidTank;
//import net.minecraftforge.liquids.LiquidStack;
public class HUDHandlerBCTanks implements IWailaDataProvider {
@@ -70,7 +64,7 @@ public class HUDHandlerBCTanks implements IWailaDataProvider {
try{
tank = ((FluidTankInfo[])BCModule.TileTank_getTankInfo.invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0];
} catch (Exception e){
mod_Waila.log.log(Level.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
Waila.log.log(Level.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
return null;
}
return tank;
@@ -2,13 +2,13 @@ package mcp.mobius.waila.addons.buildcraft;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerIPowerReceptor implements IWailaDataProvider {
@@ -4,8 +4,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.mod_Waila;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class EnderIOModule {
@@ -22,9 +22,9 @@ public class EnderIOModule {
public static void register(){
try{
Class ModClass = Class.forName("crazypants.enderio.EnderIO");
mod_Waila.log.log(Level.INFO, "EnderIO mod found.");
Waila.log.log(Level.INFO, "EnderIO mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found.");
Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found.");
return;
}
@@ -40,16 +40,16 @@ public class EnderIOModule {
TileTesseract = Class.forName("crazypants.enderio.machine.hypercube.TileHyperCube");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
return;
} catch (NoSuchMethodException e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
return;
// } catch (NoSuchFieldException e){
// mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
// return;
} catch (Exception e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
return;
}
@@ -2,12 +2,12 @@ package mcp.mobius.waila.addons.enderio;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerCapacitor implements IWailaDataProvider{
@@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.enderio;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTesseract implements IWailaDataProvider {
@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class EnderStorageModule {
@@ -20,9 +20,9 @@ public class EnderStorageModule {
public static void register(){
try{
Class EnderStorage = Class.forName("codechicken.enderstorage.EnderStorage");
mod_Waila.log.log(Level.INFO, "EnderStorage mod found.");
Waila.log.log(Level.INFO, "EnderStorage mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found.");
Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found.");
return;
}
@@ -37,16 +37,16 @@ public class EnderStorageModule {
TileEnderTank = Class.forName("codechicken.enderstorage.storage.liquid.TileEnderTank");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
return;
} catch (NoSuchMethodException e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
return;
} catch (NoSuchFieldException e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
return;
} catch (Exception e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
return;
}
@@ -2,12 +2,12 @@ package mcp.mobius.waila.addons.enderstorage;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerStorage implements IWailaDataProvider {
+6 -6
View File
@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
import java.util.logging.Level;
import net.minecraft.item.Item;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ETBModule {
@@ -29,9 +29,9 @@ public class ETBModule {
public static void register(){
try{
Class ModClass = Class.forName("emasher.sockets.TileSocket");
mod_Waila.log.log(Level.INFO, "Engineer Toolbox mod found.");
Waila.log.log(Level.INFO, "Engineer Toolbox mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found.");
Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found.");
return;
}
@@ -63,16 +63,16 @@ public class ETBModule {
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Class not found. " + e);
Waila.log.log(Level.WARNING, "[Engineer Toolbox] Class not found. " + e);
return;
// } catch (NoSuchMethodException e){
// mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Method not found." + e);
// return;
} catch (NoSuchFieldException e){
mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Field not found." + e);
Waila.log.log(Level.WARNING, "[Engineer Toolbox] Field not found." + e);
return;
} catch (Exception e){
mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Unhandled exception." + e);
Waila.log.log(Level.WARNING, "[Engineer Toolbox] Unhandled exception." + e);
return;
}
@@ -5,7 +5,7 @@ import java.util.List;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.exu;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ExtraUtilitiesModule {
@@ -15,16 +15,16 @@ public class ExtraUtilitiesModule {
try{
Class ModExtraUtilities = Class.forName("extrautils.ExtraUtils");
mod_Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
return;
}
try{
TileEntityDrum = Class.forName("extrautils.tileentity.TileEntityDrum");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[ExtraUtilities] Class not found. " + e);
Waila.log.log(Level.WARNING, "[ExtraUtilities] Class not found. " + e);
return;
}
@@ -4,7 +4,7 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.gravestone;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class GravestoneModule {
@@ -13,16 +13,16 @@ public class GravestoneModule {
try{
Class ModGravestone = Class.forName("GraveStone.ModGraveStone");
mod_Waila.log.log(Level.INFO, "GraveStone mod found.");
Waila.log.log(Level.INFO, "GraveStone mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found.");
Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found.");
return;
}
try {
BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone");
} catch (ClassNotFoundException e) {
mod_Waila.log.log(Level.WARNING, "[GraveStone] Class not found. " + e);
Waila.log.log(Level.WARNING, "[GraveStone] Class not found. " + e);
}
@@ -2,13 +2,13 @@ package mcp.mobius.waila.addons.ic2;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTEBaseGenerator implements IWailaDataProvider {
@@ -2,20 +2,19 @@ package mcp.mobius.waila.addons.ic2;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTEElectricBlock implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor,
IWailaConfigHandler config) {
// TODO Auto-generated method stub
return null;
}
@@ -2,20 +2,18 @@ package mcp.mobius.waila.addons.ic2;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTEStandardMachine implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor,
IWailaConfigHandler config) {
// TODO Auto-generated method stub
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
}
@@ -2,7 +2,6 @@ package mcp.mobius.waila.addons.ic2;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
@@ -10,9 +9,12 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTETradeOMat implements IWailaDataProvider {
//TODO : Well, redo the damn class, that's it.
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
@@ -25,7 +27,7 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
/*
if (!ConfigHandler.instance().getConfig("ic2.tradeomat")) return currenttip;
NBTTagCompound slots = accessor.getNBTData().getCompoundTag("InvSlots");
@@ -46,7 +48,7 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
ItemStack is = new ItemStack(subtag.getShort("id"), subtag.getByte("Count"), subtag.getShort("Damage"));
currenttip.add(String.format("%s : \u00a7f%d\u00a7r x \u00a7f%s\u00a7r", demandsStr, is.stackSize, is.getDisplayName()));
}
*/
return currenttip;
}
+9 -5
View File
@@ -8,7 +8,7 @@ import java.util.logging.Level;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -16,6 +16,8 @@ import mcp.mobius.waila.tools.AccessHelper;
public class IC2Module {
//TODO : Redo the upgrade handling
public static Class TileEntityStandardMachine = null;
public static Field TESM_DefaultEnergyStorage = null;
public static Field TESM_DefaultEnergyConsume = null;
@@ -96,19 +98,19 @@ public class IC2Module {
} catch (ClassNotFoundException e){
//e.printStackTrace();
mod_Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e);
Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e);
return;
} catch (NoSuchMethodException e){
//e.printStackTrace();
mod_Waila.log.log(Level.WARNING, "[IC2] Method not found." + e);
Waila.log.log(Level.WARNING, "[IC2] Method not found." + e);
return;
} catch (NoSuchFieldException e){
//e.printStackTrace();
mod_Waila.log.log(Level.WARNING, "[IC2] Field not found." + e);
Waila.log.log(Level.WARNING, "[IC2] Field not found." + e);
return;
} catch (Exception e){
//e.printStackTrace();
mod_Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e);
Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e);
return;
}
@@ -143,6 +145,7 @@ public class IC2Module {
NBTTagCompound nbt = accessor.getNBTData();
IC2Upgrades upgrades = new IC2Upgrades();
/*
if (!nbt.hasKey("InvSlots")) return null;
NBTTagCompound inventory = nbt.getCompoundTag("InvSlots");
@@ -166,6 +169,7 @@ public class IC2Module {
if (OverclockerUpgradeStack.getItemDamage() == meta && OverclockerUpgradeStack.itemID == id)
upgrades.overclocker += count;
}
*/
return upgrades;
}
@@ -2,15 +2,15 @@ package mcp.mobius.waila.addons.openblocks;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTank implements IWailaDataProvider {
@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.openblocks;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class OpenBlocksModule {
@@ -13,16 +13,16 @@ public class OpenBlocksModule {
public static void register(){
try{
Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks");
mod_Waila.log.log(Level.INFO, "OpenBlocks mod found.");
Waila.log.log(Level.INFO, "OpenBlocks mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found.");
Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found.");
return;
}
try{
TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[OpenBlocks] Class not found. " + e);
Waila.log.log(Level.WARNING, "[OpenBlocks] Class not found. " + e);
return;
}
@@ -4,7 +4,7 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.api.IWailaBlockDecorator;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -26,6 +26,7 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
@Override
public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) {
/*
if (!config.getConfig("pr.showio")) return;
@@ -197,6 +198,7 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
break;
}
*/
}
}
@@ -23,6 +23,7 @@ public class HUDHandlerRsGateLogic implements IWailaDataProvider {
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
/*
if (!config.getConfig("pr.showdata")) return currenttip;
int orient = 0;
@@ -93,7 +94,7 @@ public class HUDHandlerRsGateLogic implements IWailaDataProvider {
default:
break;
}
*/
return currenttip;
}
@@ -4,8 +4,7 @@ import java.io.File;
import java.util.logging.Level;
import net.minecraft.block.Block;
import net.minecraftforge.common.Configuration;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ProjectRedModule {
@@ -16,9 +15,9 @@ public class ProjectRedModule {
public static void register(){
try{
Class ModClass = Class.forName("mrtjp.projectred.ProjectRedIntegration");
mod_Waila.log.log(Level.INFO, "ProjectRed|Integration mod found.");
Waila.log.log(Level.INFO, "ProjectRed|Integration mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[ProjectRed] ProjectRed|Integration mod not found.");
Waila.log.log(Level.INFO, "[ProjectRed] ProjectRed|Integration mod not found.");
return;
}
@@ -28,7 +27,7 @@ public class ProjectRedModule {
BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
return;
// } catch (NoSuchMethodException e){
// mod_Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
@@ -37,7 +36,7 @@ public class ProjectRedModule {
// mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
// return;
} catch (Exception e){
mod_Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
return;
}
@@ -3,7 +3,6 @@ package mcp.mobius.waila.addons.railcraft;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
@@ -11,6 +10,7 @@ import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTank implements IWailaDataProvider {
@@ -3,7 +3,7 @@ package mcp.mobius.waila.addons.railcraft;
import java.lang.reflect.Method;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class RailcraftModule {
@@ -15,9 +15,9 @@ public class RailcraftModule {
public static void register(){
try{
Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft");
mod_Waila.log.log(Level.INFO, "Railcraft mod found.");
Waila.log.log(Level.INFO, "Railcraft mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found.");
Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found.");
return;
}
@@ -28,10 +28,10 @@ public class RailcraftModule {
//StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[Railcraft] Class not found. " + e);
Waila.log.log(Level.WARNING, "[Railcraft] Class not found. " + e);
return;
} catch (NoSuchMethodException e){
mod_Waila.log.log(Level.WARNING, "[Railcraft] Method not found." + e);
Waila.log.log(Level.WARNING, "[Railcraft] Method not found." + e);
return;
}
@@ -3,7 +3,7 @@ package mcp.mobius.waila.addons.thaumcraft;
import java.lang.reflect.Field;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ThaumcraftModule {
@@ -19,9 +19,9 @@ public class ThaumcraftModule {
try{
Class ModThaumcraft = Class.forName("thaumcraft.common.Thaumcraft");
mod_Waila.log.log(Level.INFO, "Thaumcraft mod found.");
Waila.log.log(Level.INFO, "Thaumcraft mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found.");
Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found.");
return;
}
@@ -35,13 +35,13 @@ public class ThaumcraftModule {
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Class not found. " + e);
Waila.log.log(Level.WARNING, "[Thaumcraft] Class not found. " + e);
return;
// } catch (NoSuchMethodException e){
// mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Method not found." + e);
// return;
} catch (NoSuchFieldException e){
mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Field not found." + e);
Waila.log.log(Level.WARNING, "[Thaumcraft] Field not found." + e);
return;
// } catch (Exception e){
// mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Unhandled exception." + e);
@@ -2,7 +2,6 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
@@ -11,6 +10,7 @@ import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerConduitFluid implements IWailaDataProvider {
@@ -26,7 +26,7 @@ public class HUDHandlerConduitFluid implements IWailaDataProvider {
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
/*
if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip;
boolean found = false;
@@ -51,7 +51,7 @@ public class HUDHandlerConduitFluid implements IWailaDataProvider {
currenttip.add(fluid.getFluid().getLocalizedName());
else
currenttip.add(LangUtil.translateG("hud.msg.empty"));
*/
return currenttip;
}
@@ -23,7 +23,7 @@ public class HUDHandlerConduitItem implements IWailaDataProvider {
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
/*
if (!config.getConfig("thermalexpansion.conditemmode")) return currenttip;
boolean found = false;
@@ -52,7 +52,7 @@ public class HUDHandlerConduitItem implements IWailaDataProvider {
currenttip.add("Mode : \u00a7fRound-Robin");
else
currenttip.add("Mode : <UNKNOWN>");
*/
return currenttip;
}
@@ -2,12 +2,12 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerEnergyCell implements IWailaDataProvider {
@@ -4,7 +4,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerISecureTile implements IWailaDataProvider {
@@ -3,13 +3,13 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTank implements IWailaDataProvider {
@@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerTesseract implements IWailaDataProvider {
@@ -4,8 +4,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.mod_Waila;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ThermalExpansionModule {
@@ -45,9 +45,9 @@ public class ThermalExpansionModule {
try{
Class ModThermalExpansion = Class.forName("thermalexpansion.ThermalExpansion");
mod_Waila.log.log(Level.INFO, "Thermal Expansion mod found.");
Waila.log.log(Level.INFO, "Thermal Expansion mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[Thermal Expansion] ThermalExpansion mod not found.");
Waila.log.log(Level.INFO, "[Thermal Expansion] ThermalExpansion mod not found.");
return;
}
@@ -84,13 +84,13 @@ public class ThermalExpansionModule {
//TileEnergyCell_energySend = TileEnergyCell.getField("energySend");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Class not found. " + e);
Waila.log.log(Level.WARNING, "[Thermal Expansion] Class not found. " + e);
return;
} catch (NoSuchMethodException e){
mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Method not found." + e);
Waila.log.log(Level.WARNING, "[Thermal Expansion] Method not found." + e);
return;
} catch (NoSuchFieldException e){
mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Field not found." + e);
Waila.log.log(Level.WARNING, "[Thermal Expansion] Field not found." + e);
return;
// } catch (Exception e){
// mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Unhandled exception." + e);
@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.twilightforest;
import java.util.logging.Level;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class TwilightForestModule {
@@ -15,9 +15,9 @@ public class TwilightForestModule {
try{
Class TwilightForestMod = Class.forName("twilightforest.TwilightForestMod");
mod_Waila.log.log(Level.INFO, "TwilightForestMod mod found.");
Waila.log.log(Level.INFO, "TwilightForestMod mod found.");
} catch (ClassNotFoundException e){
mod_Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found.");
Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found.");
return;
}
@@ -26,7 +26,7 @@ public class TwilightForestModule {
BlockTFPlant = Class.forName("twilightforest.block.BlockTFPlant");
BlockTFSapling = Class.forName("twilightforest.block.BlockTFSapling");
} catch (ClassNotFoundException e) {
mod_Waila.log.log(Level.WARNING, "[TwilightForestMod] Class not found. " + e);
Waila.log.log(Level.WARNING, "[TwilightForestMod] Class not found. " + e);
}
@@ -2,9 +2,10 @@ package mcp.mobius.waila.addons.vanillamc;
import java.util.List;
import codechicken.lib.lang.LangUtil;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSilverfish;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemRecord;
import net.minecraft.item.ItemStack;
@@ -14,46 +15,49 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import mcp.mobius.waila.cbcore.LangUtil;
public class HUDHandlerVanilla implements IWailaDataProvider {
static int mobSpawnerID = Block.mobSpawner.blockID;
static int cropsID = Block.crops.blockID;
static int melonStemID = Block.melonStem.blockID;
static int pumpkinStemID = Block.pumpkinStem.blockID;
static int carrotID = Block.carrot.blockID;
static int potatoID = Block.potato.blockID;
static int leverID = Block.lever.blockID;
static int repeaterIdle = Block.redstoneRepeaterIdle.blockID;
static int repeaterActv = Block.redstoneRepeaterActive.blockID;
static int comparatorIdl = Block.redstoneComparatorIdle.blockID;
static int comparatorAct = Block.redstoneComparatorActive.blockID;
static int redstone = Block.redstoneWire.blockID;
static int jukebox = Block.jukebox.blockID;
static int cocoa = Block.cocoaPlant.blockID;
static int netherwart = Block.netherStalk.blockID;
static int silverfish = Block.silverfish.blockID;
//TODO : Fix records
static Block mobSpawner = Block.getBlockFromName("mob_spawner");
static Block crops = Block.getBlockFromName("wheat");
static Block melonStem = Block.getBlockFromName("melon_stem");
static Block pumpkinStem = Block.getBlockFromName("pumpkin_stem");
static Block carrot = Block.getBlockFromName("carrots");
static Block potato = Block.getBlockFromName("potatoes");
static Block lever = Block.getBlockFromName("lever");
static Block repeaterIdle = Block.getBlockFromName("unpowered_repeater");
static Block repeaterActv = Block.getBlockFromName("powered_repeater");
static Block comparatorIdl = Block.getBlockFromName("unpowered_comparator");
static Block comparatorAct = Block.getBlockFromName("powered_comparator");
static Block redstone = Block.getBlockFromName("redstone_wire");
static Block jukebox = Block.getBlockFromName("jukebox");
static Block cocoa = Block.getBlockFromName("cocoa");
static Block netherwart = Block.getBlockFromName("nether_wart");
static Block silverfish = Block.getBlockFromName("monster_egg");
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
int blockID = accessor.getBlockID();
Block block = accessor.getBlock();
if (blockID == silverfish){
if (block.equals(silverfish)){
int metadata = accessor.getMetadata();
switch(metadata){
case 0:
return new ItemStack(Block.stone);
return new ItemStack(Blocks.stone);
case 1:
return new ItemStack(Block.cobblestone);
return new ItemStack(Blocks.cobblestone);
case 2:
return new ItemStack(Block.stoneBrick);
return new ItemStack(Blocks.brick_block);
default:
return null;
}
}
if (blockID == redstone){
return new ItemStack(Item.redstone);
if (block.equals(redstone)){
return new ItemStack(Items.redstone);
}
return null;
@@ -62,16 +66,16 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
@Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
int blockID = accessor.getBlockID();
Block block = accessor.getBlock();
/* Mob spawner handler */
if (blockID == mobSpawnerID && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){
if (block == mobSpawner && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){
String name = currenttip.get(0);
String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).getSpawnerLogic().getEntityNameToSpawn();
String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).func_145881_a().getEntityNameToSpawn();
currenttip.set(0, String.format("%s (%s)", name, mobname));
}
if (blockID == redstone){
if (block == redstone){
String name = currenttip.get(0).replaceFirst(String.format(" %s", accessor.getMetadata()), "");
currenttip.set(0, name);
}
@@ -81,10 +85,10 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
int blockID = accessor.getBlockID();
Block block = accessor.getBlock();
/* Crops */
if (config.getConfig("vanilla.growthvalue"))
if (blockID == cropsID || blockID == melonStemID || blockID == pumpkinStemID || blockID == carrotID || blockID == potatoID){
if (block == crops || block == melonStem || block == pumpkinStem || block == carrot || block == potato){
float growthValue = (accessor.getMetadata() / 7.0F) * 100.0F;
if (growthValue < 100.0)
currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
@@ -93,7 +97,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
return currenttip;
}
if (blockID == cocoa){
if (block == cocoa){
float growthValue = ((accessor.getMetadata() >> 2) / 2.0F) * 100.0F;
if (growthValue < 100.0)
@@ -103,7 +107,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
return currenttip;
}
if (blockID == netherwart){
if (block == netherwart){
float growthValue = (accessor.getMetadata() / 3.0F) * 100.0F;
if (growthValue < 100.0)
currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
@@ -113,14 +117,14 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
}
if (config.getConfig("vanilla.leverstate"))
if (blockID == leverID){
if (block == lever){
String redstoneOn = (accessor.getMetadata() & 8) == 0 ? LangUtil.translateG("hud.msg.off") : LangUtil.translateG("hud.msg.on");
currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.state"), redstoneOn));
return currenttip;
}
if (config.getConfig("vanilla.repeater"))
if ((blockID == repeaterIdle) ||(blockID == repeaterActv)){
if ((block == repeaterIdle) ||(block == repeaterActv)){
int tick = (accessor.getMetadata() >> 2) + 1 ;
if (tick == 1)
currenttip.add(String.format("%s : %s tick", LangUtil.translateG("hud.msg.delay"), tick));
@@ -130,7 +134,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
}
if (config.getConfig("vanilla.comparator"))
if ((blockID == comparatorIdl) ||(blockID == comparatorAct)){
if ((block == comparatorIdl) ||(block == comparatorAct)){
String mode = ((accessor.getMetadata() >> 2) & 1) == 0 ? LangUtil.translateG("hud.msg.comparator") : LangUtil.translateG("hud.msg.substractor");
//int outputSignal = ((TileEntityComparator)entity).func_96100_a();
currenttip.add("Mode : " + mode);
@@ -139,13 +143,14 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
}
if (config.getConfig("vanilla.redstone"))
if (blockID == redstone){
if (block == redstone){
currenttip.add(String.format("%s : %s" , LangUtil.translateG("hud.msg.power"), accessor.getMetadata()));
return currenttip;
}
/*
if (config.getConfig("vanilla.jukebox"))
if (blockID == jukebox){
if (block == jukebox){
NBTTagCompound tag = accessor.getNBTData();
Item record = null;
if (tag.hasKey("Record")){
@@ -155,7 +160,8 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
currenttip.add(LangUtil.translateG("hud.msg.empty"));
}
}
*/
return currenttip;
}
@@ -175,26 +181,26 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
IWailaDataProvider provider = new HUDHandlerVanilla();
ModuleRegistrar.instance().registerStackProvider(provider, silverfish);
ModuleRegistrar.instance().registerStackProvider(provider, redstone);
ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawnerID);
ModuleRegistrar.instance().registerBodyProvider(provider, cropsID);
ModuleRegistrar.instance().registerBodyProvider(provider, melonStemID);
ModuleRegistrar.instance().registerBodyProvider(provider, pumpkinStemID);
ModuleRegistrar.instance().registerBodyProvider(provider, carrotID);
ModuleRegistrar.instance().registerBodyProvider(provider, potatoID);
ModuleRegistrar.instance().registerBodyProvider(provider, leverID);
ModuleRegistrar.instance().registerBodyProvider(provider, repeaterIdle);
ModuleRegistrar.instance().registerBodyProvider(provider, repeaterActv);
ModuleRegistrar.instance().registerBodyProvider(provider, comparatorIdl);
ModuleRegistrar.instance().registerBodyProvider(provider, comparatorAct);
ModuleRegistrar.instance().registerHeadProvider(provider, redstone);
ModuleRegistrar.instance().registerBodyProvider(provider, redstone);
ModuleRegistrar.instance().registerBodyProvider(provider, jukebox);
ModuleRegistrar.instance().registerBodyProvider(provider, cocoa);
ModuleRegistrar.instance().registerBodyProvider(provider, netherwart);
ModuleRegistrar.instance().registerStackProvider(provider, silverfish.getClass());
ModuleRegistrar.instance().registerStackProvider(provider, redstone.getClass());
ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, crops.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, melonStem.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, pumpkinStem.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, carrot.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, potato.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, lever.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, repeaterIdle.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, repeaterActv.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, comparatorIdl.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, comparatorAct.getClass());
ModuleRegistrar.instance().registerHeadProvider(provider, redstone.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, redstone.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, jukebox.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, cocoa.getClass());
ModuleRegistrar.instance().registerBodyProvider(provider, netherwart.getClass());
ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
//ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
//ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle);
}
+2 -2
View File
@@ -7,13 +7,13 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
public interface IWailaDataAccessor {
World getWorld();
EntityPlayer getPlayer();
Block getBlock();
int getBlockID();
//int getBlockID();
int getMetadata();
TileEntity getTileEntity();
MovingObjectPosition getPosition();
@@ -7,13 +7,7 @@ public interface IWailaRegistrar {
public void addConfig(String modname, String keyname);
public void addConfigRemote(String modname, String keyname);
/* Register a IWailaDataProvider for the given blockID, either for the Head section or the Body section */
public void registerHeadProvider (IWailaDataProvider dataProvider, int blockID);
public void registerBodyProvider (IWailaDataProvider dataProvider, int blockID);
public void registerTailProvider (IWailaDataProvider dataProvider, int blockID);
/* Register a stack overrider for the given blockID */
public void registerStackProvider(IWailaDataProvider dataProvider, int blockID);
public void registerStackProvider(IWailaDataProvider dataProvider, Class block);
/* Same thing, but works on a class hierarchy instead */
@@ -22,7 +16,6 @@ public interface IWailaRegistrar {
public void registerTailProvider (IWailaDataProvider dataProvider, Class block);
/* The block decorators */
public void registerBlockDecorator (IWailaBlockDecorator decorator, int blockID);
public void registerBlockDecorator (IWailaBlockDecorator decorator, Class block);
public void registerDocTextFile (String filename);
+14 -14
View File
@@ -5,10 +5,10 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Set;
import mcp.mobius.waila.mod_Waila;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.Property;
public class ConfigHandler implements IWailaConfigHandler {
@@ -64,12 +64,12 @@ public class ConfigHandler implements IWailaConfigHandler {
@Override
public boolean getConfig(String key, boolean defvalue){
mod_Waila.instance.config.load();
Waila.instance.config.load();
if (this.serverconfigs.contains(key) && !mod_Waila.instance.serverPresent)
if (this.serverconfigs.contains(key) && !Waila.instance.serverPresent)
return false;
Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, defvalue);
Property prop = Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, defvalue);
return prop.getBoolean(defvalue);
}
@@ -83,21 +83,21 @@ public class ConfigHandler implements IWailaConfigHandler {
}
public int getConfigInt(String key){
mod_Waila.instance.config.load();
Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, 0);
Waila.instance.config.load();
Property prop = Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, 0);
return prop.getInt();
}
@Override
public void setConfig(String key, boolean value){
mod_Waila.instance.config.load();
mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, true).set(value);;
mod_Waila.instance.config.save();
Waila.instance.config.load();
Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, true).set(value);;
Waila.instance.config.save();
}
public void setConfigInt(String key, int value){
mod_Waila.instance.config.load();
mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, 0).set(value);;
mod_Waila.instance.config.save();
Waila.instance.config.load();
Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, 0).set(value);;
Waila.instance.config.save();
}
}
+12 -7
View File
@@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.api.IWailaDataAccessor;
public class DataAccessor implements IWailaDataAccessor {
@@ -22,7 +22,7 @@ public class DataAccessor implements IWailaDataAccessor {
public MovingObjectPosition mop;
public Vec3 renderingvec = null;
public Block block;
public int blockID;
//public int blockID;
public int metadata;
public TileEntity entity;
public NBTTagCompound remoteNbt = null;
@@ -39,10 +39,11 @@ public class DataAccessor implements IWailaDataAccessor {
this.world = _world;
this.player = _player;
this.mop = _mop;
this.blockID = world.getBlockId(_mop.blockX, _mop.blockY, _mop.blockZ);
this.block = Block.blocksList[this.blockID];
//this.blockID = world.getBlockId(_mop.blockX, _mop.blockY, _mop.blockZ);
//this.block = Block.blocksList[this.blockID];
this.block = world.getBlock(_mop.blockX, _mop.blockY, _mop.blockZ);
this.metadata = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ);
this.entity = world.getBlockTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
this.entity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
if (viewEntity != null){
double px = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks;
@@ -68,10 +69,12 @@ public class DataAccessor implements IWailaDataAccessor {
return this.block;
}
/*
@Override
public int getBlockID() {
return this.blockID;
}
}
*/
@Override
public int getMetadata() {
@@ -82,9 +85,11 @@ public class DataAccessor implements IWailaDataAccessor {
this.block = block;
}
/*
public void setBlockID(int val) {
this.blockID = val;
}
}
*/
public void setMetadata(int val) {
this.metadata = val;
+5
View File
@@ -0,0 +1,5 @@
package mcp.mobius.waila.api.impl;
public enum Layout {
HEADER, BODY, FOOTER
}
@@ -4,18 +4,17 @@ import java.util.ArrayList;
import java.util.List;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.IWailaBlock;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.network.Packet0x01TERequest;
import mcp.mobius.waila.network.Message0x01TERequest;
import mcp.mobius.waila.network.WailaPacketHandler;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import codechicken.nei.api.ItemInfo.Layout;
import cpw.mods.fml.common.network.PacketDispatcher;
public class MetaDataProvider{
@@ -27,7 +26,6 @@ public class MetaDataProvider{
public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessor accessor) {
Block block = accessor.getBlock();
int blockID = accessor.getBlockID();
if (IWailaBlock.class.isInstance(block)){
try{
@@ -37,8 +35,8 @@ public class MetaDataProvider{
}
}
if(ModuleRegistrar.instance().hasStackProviders(blockID)){
for (IWailaDataProvider dataProvider : ModuleRegistrar.instance().getStackProviders(blockID)){
if(ModuleRegistrar.instance().hasStackProviders(block)){
for (IWailaDataProvider dataProvider : ModuleRegistrar.instance().getStackProviders(block)){
try{
ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance());
if (retval != null)
@@ -53,17 +51,17 @@ public class MetaDataProvider{
public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessor accessor, List<String> currenttip, Layout layout) {
Block block = accessor.getBlock();
int blockID = accessor.getBlockID();
if (accessor.getTileEntity() != null && mod_Waila.instance.serverPresent &&
if (accessor.getTileEntity() != null && Waila.instance.serverPresent &&
((System.currentTimeMillis() - accessor.timeLastUpdate >= 250))){
accessor.timeLastUpdate = System.currentTimeMillis();
PacketDispatcher.sendPacketToServer(Packet0x01TERequest.create(world, mop));
WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity()));
}
/* Interface IWailaBlock */
if (IWailaBlock.class.isInstance(block)){
TileEntity entity = world.getBlockTileEntity(mop.blockX, mop.blockY, mop.blockZ);
TileEntity entity = world.getTileEntity(mop.blockX, mop.blockY, mop.blockZ);
if (layout == Layout.HEADER)
try{
return ((IWailaBlock)block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
+24 -126
View File
@@ -10,14 +10,14 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import au.com.bytecode.opencsv.CSVReader;
//import au.com.bytecode.opencsv.CSVReader;
import net.minecraft.block.Block;
import codechicken.lib.lang.LangUtil;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.IWailaBlockDecorator;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
import mcp.mobius.waila.api.IWailaSummaryProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class ModuleRegistrar implements IWailaRegistrar {
@@ -25,14 +25,13 @@ public class ModuleRegistrar implements IWailaRegistrar {
//public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> headProviders = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();
//public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> bodyProviders = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();
//public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> tailProviders = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();
public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> stackProviders = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();
//public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> stackProviders = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();
public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> headBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> bodyBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> tailBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
//public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> stackBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> stackBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
public LinkedHashMap<Integer, ArrayList<IWailaBlockDecorator>> blockIdDecorators = new LinkedHashMap<Integer, ArrayList<IWailaBlockDecorator>>();
public LinkedHashMap<Class, ArrayList<IWailaBlockDecorator>> blockClassDecorators = new LinkedHashMap<Class, ArrayList<IWailaBlockDecorator>>();
public LinkedHashMap<String, LinkedHashMap <String, LinkedHashMap <String, String>>> wikiDescriptions = new LinkedHashMap<String, LinkedHashMap <String, LinkedHashMap <String, String>>>();
@@ -69,11 +68,6 @@ public class ModuleRegistrar implements IWailaRegistrar {
ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG("option." + key));
}
@Override
public void registerHeadProvider(IWailaDataProvider dataProvider, int blockID) {
this.registerHeadProvider(dataProvider, Block.blocksList[blockID].getClass());
}
@Override
public void registerHeadProvider(IWailaDataProvider dataProvider, Class block) {
if (!this.headBlockProviders.containsKey(block))
@@ -85,11 +79,6 @@ public class ModuleRegistrar implements IWailaRegistrar {
this.headBlockProviders.get(block).add(dataProvider);
}
@Override
public void registerBodyProvider(IWailaDataProvider dataProvider, int blockID) {
this.registerBodyProvider(dataProvider, Block.blocksList[blockID].getClass());
}
@Override
public void registerBodyProvider(IWailaDataProvider dataProvider, Class block) {
if (!this.bodyBlockProviders.containsKey(block))
@@ -101,11 +90,6 @@ public class ModuleRegistrar implements IWailaRegistrar {
this.bodyBlockProviders.get(block).add(dataProvider);
}
@Override
public void registerTailProvider(IWailaDataProvider dataProvider, int blockID) {
this.registerTailProvider(dataProvider, Block.blocksList[blockID].getClass());
}
@Override
public void registerTailProvider(IWailaDataProvider dataProvider, Class block) {
if (!this.tailBlockProviders.containsKey(block))
@@ -117,19 +101,15 @@ public class ModuleRegistrar implements IWailaRegistrar {
this.tailBlockProviders.get(block).add(dataProvider);
}
@Override
public void registerStackProvider(IWailaDataProvider dataProvider, int blockID) {
if (!this.stackProviders.containsKey(blockID))
this.stackProviders.put(blockID, new ArrayList<IWailaDataProvider>());
this.stackProviders.get(blockID).add(dataProvider);
}
@Override
public void registerStackProvider(IWailaDataProvider dataProvider, Class block) {
for (int i = 0; i < Block.blocksList.length; i++)
if (block.isInstance(Block.blocksList[i])){
this.registerStackProvider(dataProvider, i);
}
if (!this.stackBlockProviders.containsKey(block))
this.stackBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
ArrayList<IWailaDataProvider> providers = this.stackBlockProviders.get(block);
if (providers.contains(dataProvider)) return;
this.stackBlockProviders.get(block).add(dataProvider);
}
@Override
@@ -139,13 +119,6 @@ public class ModuleRegistrar implements IWailaRegistrar {
this.summaryProviders.get(item).add(dataProvider);
}
@Override
public void registerBlockDecorator(IWailaBlockDecorator decorator, int blockID) {
if (!this.blockIdDecorators.containsKey(blockID))
this.blockIdDecorators.put(blockID, new ArrayList<IWailaBlockDecorator>());
this.blockIdDecorators.get(blockID).add(decorator);
}
@Override
public void registerBlockDecorator(IWailaBlockDecorator decorator, Class block) {
if (!this.blockClassDecorators.containsKey(block))
@@ -180,8 +153,13 @@ public class ModuleRegistrar implements IWailaRegistrar {
return returnList;
}
public ArrayList<IWailaDataProvider> getStackProviders(int blockID) {
return this.stackProviders.get(blockID);
public ArrayList<IWailaDataProvider> getStackProviders(Object block) {
ArrayList<IWailaDataProvider> returnList = new ArrayList<IWailaDataProvider>();
for (Class clazz : this.stackBlockProviders.keySet())
if (clazz.isInstance(block))
returnList.addAll(this.stackBlockProviders.get(clazz));
return returnList;
}
public ArrayList<IWailaSummaryProvider> getSummaryProvider(Object item){
@@ -192,10 +170,6 @@ public class ModuleRegistrar implements IWailaRegistrar {
return returnList;
}
public ArrayList<IWailaBlockDecorator> getBlockDecorators(int blockID){
return this.blockIdDecorators.get(blockID);
}
public ArrayList<IWailaBlockDecorator> getBlockDecorators(Object block){
ArrayList<IWailaBlockDecorator> returnList = new ArrayList<IWailaBlockDecorator>();
@@ -206,8 +180,11 @@ public class ModuleRegistrar implements IWailaRegistrar {
return returnList;
}
public boolean hasStackProviders(int blockID){
return this.stackProviders.containsKey(blockID);
public boolean hasStackProviders(Object block){
for (Class clazz : this.stackBlockProviders.keySet())
if (clazz.isInstance(block))
return true;
return false;
}
public boolean hasHeadProviders(Object block){
@@ -235,10 +212,6 @@ public class ModuleRegistrar implements IWailaRegistrar {
return this.summaryProviders.containsKey(item);
}
public boolean hasBlockDecorator(int blockID){
return this.blockIdDecorators.containsKey(blockID);
}
public boolean hasBlockDecorator(Object block){
for (Class clazz : this.blockClassDecorators.keySet())
if (clazz.isInstance(block))
@@ -249,53 +222,6 @@ public class ModuleRegistrar implements IWailaRegistrar {
/* ----------------- */
@Override
public void registerDocTextFile(String filename) {
List<String[]> docData = null;
int nentries = 0;
try{
docData = this.readFileAsString(filename);
} catch (IOException e){
mod_Waila.log.log(Level.WARNING, String.format("Error while accessing file %s : %s", filename, e));
return;
}
for (String[] ss : docData){
String modid = ss[0];
String name = ss[1];
String meta = ss[2];
String desc = ss[5].replace('$', '\n');
if (!(desc.trim().equals(""))){
if (!this.wikiDescriptions.containsKey(modid))
this.wikiDescriptions.put(modid, new LinkedHashMap <String, LinkedHashMap <String, String>>());
if (!this.wikiDescriptions.get(modid).containsKey(name))
this.wikiDescriptions.get(modid).put(name, new LinkedHashMap<String, String>());
this.wikiDescriptions.get(modid).get(name).put(meta, desc);
System.out.printf("Registered %s %s %s\n", modid, name, meta);
nentries += 1;
}
}
/*
String[] sections = docData.split(">>>>");
for (String s : sections){
s.trim();
if (!s.equals("")){
try{
String name = s.split("\r?\n",2)[0].trim();
String desc = s.split("\r?\n",2)[1].trim();
if (!this.wikiDescriptions.containsKey(modid))
this.wikiDescriptions.put(modid, new LinkedHashMap <String, String>());
this.wikiDescriptions.get(modid).put(name, desc);
nentries += 1;
}catch (Exception e){
System.out.printf("%s\n", e);
}
}
}
*/
mod_Waila.log.log(Level.INFO, String.format("Registered %s entries from %s", nentries, filename));
}
public boolean hasDocTextModID(String modid){
@@ -341,32 +267,4 @@ public class ModuleRegistrar implements IWailaRegistrar {
}
return null;
}
private List<String[]> readFileAsString(String filePath) throws IOException {
// URL fileURL = this.getClass().getResource(filePath);
// File filedata = new File(fileURL);
// Reader paramReader = new InputStreamReader(this.getClass().getResourceAsStream(filePath));
InputStream in = getClass().getResourceAsStream(filePath);
BufferedReader input = new BufferedReader(new InputStreamReader(in));
CSVReader reader = new CSVReader(input);
List<String[]> myEntries = reader.readAll();
reader.close();
return myEntries;
/*
StringBuffer fileData = new StringBuffer();
//BufferedReader reader = new BufferedReader(paramReader);
char[] buf = new char[1024];
int numRead=0;
while((numRead=input.read(buf)) != -1){
String readData = String.valueOf(buf, 0, numRead);
fileData.append(readData);
}
input.close();
return fileData.toString();
*/
}
}
+237
View File
@@ -0,0 +1,237 @@
package mcp.mobius.waila.cbcore;
import java.awt.Dimension;
import java.awt.Point;
import java.util.Arrays;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
/* THIS CLASS IS A COPY OF THE ORIGINAL CLASS FROM CHICKENBONES */
/* ALL CREDITS GO TO HIM FOR MAKING IT */
public class GuiDraw {
public static class GuiHook extends Gui
{
public void setZLevel(float f)
{
zLevel = f;
}
public float getZLevel()
{
return zLevel;
}
public void incZLevel(float f)
{
zLevel+=f;
}
@Override
public void drawGradientRect(int par1, int par2, int par3, int par4, int par5, int par6)
{
super.drawGradientRect(par1, par2, par3, par4, par5, par6);
}
}
public static final GuiHook gui = new GuiHook();
public static FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
public static TextureManager renderEngine = Minecraft.getMinecraft().renderEngine;
public static void drawRect(int x, int y, int w, int h, int colour)
{
drawGradientRect(x, y, w, h, colour, colour);
}
public static void drawGradientRect(int x, int y, int w, int h, int colour1, int colour2)
{
gui.drawGradientRect(x, y, x + w, y + h, colour1, colour2);
}
public static void drawTexturedModalRect(int x, int y, int tx, int ty, int w, int h)
{
gui.drawTexturedModalRect(x, y, tx, ty, w, h);
}
public static void drawString(String text, int x, int y, int colour, boolean shadow)
{
if(shadow)
fontRenderer.drawStringWithShadow(text, x, y, colour);
else
fontRenderer.drawString(text, x, y, colour);
}
public static void drawString(String text, int x, int y, int colour)
{
drawString(text, x, y, colour, true);
}
public static void drawStringC(String text, int x, int y, int w, int h, int colour, boolean shadow)
{
drawString(text, x + (w - getStringWidth(text)) / 2, y + (h - 8) / 2, colour, shadow);
}
public static void drawStringC(String text, int x, int y, int w, int h, int colour)
{
drawStringC(text, x, y, w, h, colour, true);
}
public static void drawStringC(String text, int x, int y, int colour, boolean shadow)
{
drawString(text, x - getStringWidth(text) / 2, y, colour, shadow);
}
public static void drawStringC(String text, int x, int y, int colour)
{
drawStringC(text, x, y, colour, true);
}
public static void drawStringR(String text, int x, int y, int colour, boolean shadow)
{
drawString(text, x - getStringWidth(text), y, colour, shadow);
}
public static void drawStringR(String text, int x, int y, int colour)
{
drawStringR(text, x, y, colour, true);
}
public static int getStringWidth(String s)
{
if(s == null || s.equals(""))
return 0;
return getStringWidthNoColours(fontRenderer, s);
}
public static int getStringWidthNoColours(FontRenderer fontRenderer, String s)
{
while(true)
{
int pos = s.indexOf('\247');
if(pos == -1)
break;
s = s.substring(0, pos)+s.substring(pos+2);
}
return fontRenderer.getStringWidth(s);
}
public static Dimension displaySize()
{
Minecraft mc = Minecraft.getMinecraft();
ScaledResolution res = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
return new Dimension(res.getScaledWidth(), res.getScaledHeight());
}
public static Dimension displayRes()
{
Minecraft mc = Minecraft.getMinecraft();
return new Dimension(mc.displayWidth, mc.displayHeight);
}
public static Point getMousePosition()
{
Dimension size = displaySize();
Dimension res = displayRes();
return new Point(Mouse.getX() * size.width / res.width, size.height - Mouse.getY() * size.height / res.height - 1);
}
/*
public static void changeTexture(String s)
{
CCRenderState.changeTexture(s);
}
public static void changeTexture(ResourceLocation r)
{
CCRenderState.changeTexture(r);
}
*/
public static void drawTip(int x, int y, String text)
{
drawMultilineTip(x, y, Arrays.asList(text));
}
/**
* Append a string in the list with "\247h" to have a small gap between it and the next line
*/
public static void drawMultilineTip(int x, int y, List<String> list)
{
if(list.isEmpty())
return;
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST);
int w = 0;
for(int line = 0; line < list.size(); line++)
{
int swidth = getStringWidthNoColours(fontRenderer, list.get(line));
if(swidth > w)
w = swidth;
}
int h = -2;
for(int i = 0; i < list.size(); i++)
h+=list.get(i).endsWith("\247h") && i+1 < list.size() ? 12 : 10;
x = (int) clip(x, 8, displaySize().width - 8 - w);
y = (int) clip(y, 8, displaySize().height - 8 - h);
gui.incZLevel(300);
drawTooltipBox(x-4, y-4, w + 7, h + 7);
for(int i = 0; i < list.size(); i++)
{
String s = list.get(i);
fontRenderer.drawStringWithShadow(s, x, y, -1);
if(s.endsWith("\247h"))
y+=2;
y += 10;
}
gui.incZLevel(-300);
}
public static void drawTooltipBox(int x, int y, int w, int h)
{
int bg = 0xf0100010;
drawGradientRect(x + 1, y, w - 1, 1, bg, bg);
drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg);
drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg);//center
drawGradientRect(x, y + 1, 1, h - 1, bg, bg);
drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg);
int grad1 = 0x505000ff;
int grad2 = 0x5028007F;
drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2);
drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2);
drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1);
drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2);
}
public static double clip(double value, double min, double max)
{
if(value > max)
value = max;
if(value < min)
value = min;
return value;
}
}
+90
View File
@@ -0,0 +1,90 @@
package mcp.mobius.waila.cbcore;
import static mcp.mobius.waila.cbcore.GuiDraw.fontRenderer;
import static mcp.mobius.waila.cbcore.GuiDraw.renderEngine;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashSet;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
/* THIS CLASS IS A COPY OF THE ORIGINAL CLASS FROM CHICKENBONES */
/* ALL CREDITS GO TO HIM FOR MAKING IT */
public class ItemRenderer {
public static RenderItem drawItems = new RenderItem();
public static FontRenderer getFontRenderer(ItemStack stack)
{
if(stack != null && stack.getItem() != null)
{
FontRenderer f = stack.getItem().getFontRenderer(stack);
if(f != null)
return f;
}
return fontRenderer;
}
public static void drawItem(int i, int j, ItemStack itemstack)
{
drawItem(i, j, itemstack, getFontRenderer(itemstack));
}
private static HashSet<String> stackTraces = new HashSet<String>();
public static void drawItem(int i, int j, ItemStack itemstack, FontRenderer fontRenderer)
{
enable3DRender();
drawItems.zLevel += 100F;
try
{
drawItems.renderItemAndEffectIntoGUI(fontRenderer, renderEngine, itemstack, i, j);
drawItems.renderItemOverlayIntoGUI(fontRenderer, renderEngine, itemstack, i, j);
}
catch(Exception e)
{
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
String stackTrace = itemstack+sw.toString();
if(!stackTraces.contains(stackTrace))
{
System.err.println("Error while rendering: "+itemstack);
e.printStackTrace();
stackTraces.add(stackTrace);
}
//if(Tessellator.instance.isDrawing)
Tessellator.instance.draw();
drawItems.renderItemIntoGUI(fontRenderer, renderEngine, new ItemStack(Blocks.fire, 1, 0), i, j);
}
drawItems.zLevel -= 100F;
enable2DRender();
//if(Tessellator.instance.isDrawing)
try{
Tessellator.instance.draw();
} catch (Exception e){
}
}
public static void enable3DRender()
{
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_DEPTH_TEST);
}
public static void enable2DRender()
{
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST);
}
}
+110
View File
@@ -0,0 +1,110 @@
package mcp.mobius.waila.cbcore;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.SortedSet;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.Language;
import net.minecraft.client.resources.IResource;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Easy localisation access.
*/
public class LangUtil
{
public static LangUtil instance = new LangUtil(null);
public String prefix;
public LangUtil(String prefix)
{
this.prefix = prefix;
}
public static String translateG(String s, Object... format)
{
return instance.translate(s, format);
}
public String translate(String s, Object... format)
{
if(prefix != null && !s.startsWith(prefix+"."))
s = prefix+"."+s;
String ret = LanguageRegistry.instance().getStringLocalization(s);
if(ret.length() == 0)
ret = LanguageRegistry.instance().getStringLocalization(s, "en_US");
if(ret.length() == 0)
ret = StatCollector.translateToLocal(s);
if(ret.length() == 0)
return s;
if(format.length > 0)
ret = String.format(ret, format);
return ret;
}
public void addLangFile(InputStream resource, String lang) throws IOException
{
LanguageRegistry reg = LanguageRegistry.instance();
BufferedReader reader = new BufferedReader(new InputStreamReader(resource, "UTF-8"));
while(true)
{
String read = reader.readLine();
if(read == null)
break;
int equalIndex = read.indexOf('=');
if(equalIndex == -1)
continue;
String key = read.substring(0, equalIndex);
String value = read.substring(equalIndex+1);
if(prefix != null)
key = prefix+"."+key;
reg.addStringLocalization(key, lang, value);
}
}
@SideOnly(Side.CLIENT)
public static LangUtil loadLangDir(String domain)
{
return new LangUtil(domain).addLangDir(new ResourceLocation(domain, "lang"));
}
@SideOnly(Side.CLIENT)
public LangUtil addLangDir(ResourceLocation dir)
{
IResourceManager resManager = Minecraft.getMinecraft().getResourceManager();
for(Language lang : (SortedSet<Language>)Minecraft.getMinecraft().getLanguageManager().getLanguages())
{
String langID = lang.getLanguageCode();
IResource langRes;
try
{
langRes = resManager.getResource(new ResourceLocation(dir.getResourceDomain(), dir.getResourcePath()+'/'+langID+".lang"));
}
catch(Exception e)
{
continue;
}
try
{
addLangFile(langRes.getInputStream(), langID);
}
catch(IOException e)
{
System.err.println("Failed to load lang resource. domain="+prefix+", resource="+langRes);
e.printStackTrace();
}
}
return this;
}
}
+25 -40
View File
@@ -6,39 +6,30 @@ import java.util.List;
import mcp.mobius.waila.Constants;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.gui.screens.config.ScreenConfig;
import mcp.mobius.waila.gui.screens.info.ScreenEnchants;
import mcp.mobius.waila.handlers.nei.HandlerEnchants;
import mcp.mobius.waila.overlay.RayTracing;
//import mcp.mobius.waila.gui.screens.info.ScreenEnchants;
//import mcp.mobius.waila.handlers.nei.HandlerEnchants;
//import codechicken.lib.lang.LangUtil;
//import codechicken.nei.api.API;
//import codechicken.nei.forge.GuiContainerManager;
//import codechicken.nei.recipe.GuiCraftingRecipe;
//import codechicken.nei.recipe.GuiUsageRecipe;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumMovingObjectType;
import org.lwjgl.input.Keyboard;
import codechicken.lib.lang.LangUtil;
import codechicken.nei.api.API;
import codechicken.nei.forge.GuiContainerManager;
import codechicken.nei.recipe.GuiCraftingRecipe;
import codechicken.nei.recipe.GuiUsageRecipe;
import cpw.mods.fml.client.registry.KeyBindingRegistry.KeyHandler;
import cpw.mods.fml.common.TickType;
import cpw.mods.fml.common.registry.LanguageRegistry;
public class ConfigKeyHandler extends KeyHandler {
public class ConfigKeyHandler {
static boolean firstInventory = true;
/*
public ConfigKeyHandler()
{
super(new KeyBinding[]{
new KeyBinding(Constants.BIND_WAILA_CFG, Keyboard.KEY_NUMPAD0),
new KeyBinding(Constants.BIND_WAILA_SHOW, Keyboard.KEY_NUMPAD1),
new KeyBinding(Constants.BIND_WAILA_LIQUID, Keyboard.KEY_NUMPAD2),
new KeyBinding(Constants.BIND_WAILA_RECIPE, Keyboard.KEY_NUMPAD3),
new KeyBinding(Constants.BIND_WAILA_USAGE, Keyboard.KEY_NUMPAD4),
new KeyBinding(Constants.BIND_WAILA_CFG, Keyboard.KEY_NUMPAD0, "Waila"),
new KeyBinding(Constants.BIND_WAILA_SHOW, Keyboard.KEY_NUMPAD1, "Waila"),
new KeyBinding(Constants.BIND_WAILA_LIQUID, Keyboard.KEY_NUMPAD2, "Waila"),
new KeyBinding(Constants.BIND_WAILA_RECIPE, Keyboard.KEY_NUMPAD3, "Waila"),
new KeyBinding(Constants.BIND_WAILA_USAGE, Keyboard.KEY_NUMPAD4, "Waila"),
//new KeyBinding(Constants.BIND_WAILA_TESTING, Keyboard.KEY_NUMPAD9),
}, new boolean[]{
false,
@@ -49,23 +40,14 @@ public class ConfigKeyHandler extends KeyHandler {
//false
});
/*
LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_CFG, LangUtil.translateG("keybind.configscreen"));
LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_SHOW, LangUtil.translateG("keybind.showhide"));
LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_LIQUID, LangUtil.translateG("keybind.showliquid"));
LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_RECIPE, LangUtil.translateG("keybind.showrecipe"));
LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_USAGE, LangUtil.translateG("keybind.showusage"));
LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_TESTING, LangUtil.translateG("keybind.testing"));
*/
//LanguageRegistry.instance().addStringLocalization(Constants.BIND_SCREEN_ENCH, "[Waila] Show enchant screen");
//LanguageRegistry.instance().addStringLocalization("key.wailatedump", "[Waila] Dump server TE");
GuiContainerManager.addInputHandler(new HandlerEnchants());
API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I);
//GuiContainerManager.addInputHandler(new HandlerEnchants());
//API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I);
}
*/
@Override
/*
public void keyDown(EnumSet<TickType> types, KeyBinding kb, boolean tickEnd, boolean isRepeat) {
if (!tickEnd) return;
Minecraft mc = Minecraft.getMinecraft();
if (kb.keyDescription == Constants.BIND_WAILA_CFG){
@@ -102,11 +84,11 @@ public class ConfigKeyHandler extends KeyHandler {
else if (kb.keyDescription == Constants.BIND_WAILA_USAGE){
this.openRecipeGUI(false);
}
}
*/
public void openRecipeGUI(boolean recipe){
/*
Minecraft mc = Minecraft.getMinecraft();
boolean uiResult;
String msg;
@@ -143,8 +125,10 @@ public class ConfigKeyHandler extends KeyHandler {
}
}
}
*/
}
/*
@Override
public void keyUp(EnumSet<TickType> types, KeyBinding kb, boolean tickEnd) {
if (!tickEnd) return;
@@ -161,6 +145,7 @@ public class ConfigKeyHandler extends KeyHandler {
@Override
public String getLabel() {
return "Waila Config Screen Keybind";
}
}
*/
}
+36 -31
View File
@@ -1,7 +1,10 @@
package mcp.mobius.waila.client;
import mcp.mobius.waila.Constants;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.cbcore.LangUtil;
import mcp.mobius.waila.events.KeyHandler;
import mcp.mobius.waila.events.TickHandler;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.addons.appeng.AppEngModule;
import mcp.mobius.waila.addons.buildcraft.BCModule;
import mcp.mobius.waila.addons.buildcraft.BCPowerAPIModule;
@@ -24,22 +27,20 @@ import mcp.mobius.waila.gui.truetyper.FontLoader;
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
import mcp.mobius.waila.handlers.HUDHandlerWaila;
import mcp.mobius.waila.handlers.SummaryProviderDefault;
import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila;
import mcp.mobius.waila.overlay.WailaTickHandler;
//import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila;
import mcp.mobius.waila.server.ProxyServer;
import net.minecraft.block.Block;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.input.Keyboard;
import codechicken.lib.lang.LangUtil;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.api.API;
import codechicken.nei.api.ItemInfo;
import codechicken.nei.forge.GuiContainerManager;
import cpw.mods.fml.client.registry.KeyBindingRegistry;
import cpw.mods.fml.common.registry.TickRegistry;
//import cpw.mods.fml.client.registry.KeyBindingRegistry;
//import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
public class ProxyClient extends ProxyServer {
@@ -48,19 +49,21 @@ public class ProxyClient extends ProxyServer {
//public static LangUtil lang = LangUtil.loadLangDir("waila");
public ProxyClient() {}
@Override
public void registerHandlers(){
//LangUtil.instance.addLangDir(new ResourceLocation("waila", "lang"));
LangUtil.instance.loadLangDir("waila");
minecraftiaFont = FontLoader.createFont(new ResourceLocation("waila", "fonts/Minecraftia.ttf"), 14, true);
//minecraftiaFont = FontLoader.createFont(new ResourceLocation("waila", "fonts/Minecraftia.ttf"), 14, true);
TickRegistry.registerTickHandler(WailaTickHandler.instance(), Side.CLIENT);
//TickRegistry.registerTickHandler(WailaTickHandler.instance(), Side.CLIENT);
GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila());
//GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila());
//API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.HEADER);
//API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.BODY);
@@ -68,15 +71,17 @@ public class ProxyClient extends ProxyServer {
//API.registerHighlightHandler(new HUDHandlerWaila(), ItemInfo.Layout.FOOTER);
//API.registerHighlightHandler(new HUDHandlerWaila(), ItemInfo.Layout.HEADER);
KeyBindingRegistry.registerKeyBinding(new ConfigKeyHandler());
//KeyBindingRegistry.registerKeyBinding(new ConfigKeyHandler());
// We mute the default keybind for displaying the tooltip
NEIClientConfig.getSetting(Constants.BIND_NEI_SHOW).setIntValue(Keyboard.KEY_NONE);
NEIClientConfig.getSetting(Constants.CFG_NEI_SHOW).setBooleanValue(false);
//NEIClientConfig.getSetting(Constants.BIND_NEI_SHOW).setIntValue(Keyboard.KEY_NONE);
//NEIClientConfig.getSetting(Constants.CFG_NEI_SHOW).setBooleanValue(false);
//API.addKeyBind(Constants.BIND_WIKI, "Display wiki", Keyboard.KEY_RSHIFT);
//API.addKeyBind(Constants.BIND_TECH, "Display techtree", Keyboard.KEY_RSHIFT);
KeyHandler.registerKeybinds();
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerWaila(), Block.class);
ModuleRegistrar.instance().registerTailProvider(new HUDHandlerWaila(), Block.class);
ModuleRegistrar.instance().registerShortDataProvider(new SummaryProviderDefault(), Item.class);
@@ -91,49 +96,49 @@ public class ProxyClient extends ProxyServer {
//BetterBarrelsModule.register();
/* BUILDCRAFT */
BCModule.register();
//BCModule.register();
/* INDUSTRIALCRAFT2 */
IC2Module.register();
//IC2Module.register();
/*Thaumcraft*/
ThaumcraftModule.register();
//ThaumcraftModule.register();
/*EnderStorage*/
EnderStorageModule.register();
//EnderStorageModule.register();
/*Gravestone*/
GravestoneModule.register();
//GravestoneModule.register();
/*Twilight forest*/
TwilightForestModule.register();
//TwilightForestModule.register();
/* Applied Energetics */
AppEngModule.register();
//AppEngModule.register();
/* Thermal Expansion */
ThermalExpansionModule.register();
//ThermalExpansionModule.register();
/* ETB */
ETBModule.register();
//ETBModule.register();
/* EnderIO */
EnderIOModule.register();
//EnderIOModule.register();
/* Buildcraft Power API */
BCPowerAPIModule.register();
//BCPowerAPIModule.register();
/* ProjectRed API */
ProjectRedModule.register();
//ProjectRedModule.register();
/* ExtraUtilities */
ExtraUtilitiesModule.register();
//ExtraUtilitiesModule.register();
/* OpenBlocks */
OpenBlocksModule.register();
//OpenBlocksModule.register();
/* Railcraft */
RailcraftModule.register();
//RailcraftModule.register();
}
@Override
@@ -1,9 +1,12 @@
package mcp.mobius.waila.client;
package mcp.mobius.waila.events;
import java.util.ArrayList;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mcp.mobius.waila.WailaExceptionHandler;
@@ -19,13 +22,13 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.event.ForgeSubscribe;
public class WailaClientEventHandler {
public class DecoratorRenderer {
@ForgeSubscribe
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void onRenderWorldLast(RenderWorldLastEvent event) {
if (RayTracing.instance().getTarget() == null || RayTracing.instance().getTargetStack() == null) return;
double partialTicks = event.partialTicks;
@@ -40,9 +43,8 @@ public class WailaClientEventHandler {
accessor.set(world, player, RayTracing.instance().getTarget(), viewEntity, partialTicks);
Block block = accessor.getBlock();
int blockID = accessor.getBlockID();
if (!ModuleRegistrar.instance().hasBlockDecorator(blockID) && !ModuleRegistrar.instance().hasBlockDecorator(block)) return;
if (!ModuleRegistrar.instance().hasBlockDecorator(block) && !ModuleRegistrar.instance().hasBlockDecorator(block)) return;
GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
GL11.glDisable(GL11.GL_TEXTURE_2D);
@@ -50,8 +52,8 @@ public class WailaClientEventHandler {
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDepthMask(false);
if (ModuleRegistrar.instance().hasBlockDecorator(blockID)){
for (IWailaBlockDecorator decorator : ModuleRegistrar.instance().getBlockDecorators(blockID))
if (ModuleRegistrar.instance().hasBlockDecorator(block)){
for (IWailaBlockDecorator decorator : ModuleRegistrar.instance().getBlockDecorators(block))
try{
GL11.glPushMatrix();
decorator.decorateBlock(RayTracing.instance().getTargetStack(), accessor, ConfigHandler.instance());
+60
View File
@@ -0,0 +1,60 @@
package mcp.mobius.waila.events;
import mcp.mobius.waila.Constants;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.gui.screens.config.ScreenConfig;
import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.KeyBinding;
import org.apache.commons.lang3.ArrayUtils;
import org.lwjgl.input.Keyboard;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
public class KeyHandler {
static KeyBinding key_cfg;
static KeyBinding key_show;
static KeyBinding key_liquid;
@SubscribeEvent
public void onKeyEvent(KeyInputEvent event){
int key = Keyboard.getEventKey();
Minecraft mc = Minecraft.getMinecraft();
if (Keyboard.getEventKeyState()){
if (key == key_cfg.getKeyCode()){
if(mc.currentScreen == null)
mc.displayGuiScreen(new ScreenConfig(mc.currentScreen));
}
else if (key == key_show.getKeyCode() && ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
boolean status = ConfigHandler.instance().getConfig(Constants.CFG_WAILA_SHOW);
ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, !status);
}
else if (key == key_show.getKeyCode() && !ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, true);
}
else if (key == key_liquid.getKeyCode()){
boolean status = ConfigHandler.instance().getConfig(Constants.CFG_WAILA_LIQUID);
ConfigHandler.instance().setConfig(Constants.CFG_WAILA_LIQUID, !status);
}
} else {
if (key == key_show.getKeyCode() && !ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, false);
}
}
}
public static void registerKeybinds(){
KeyHandler.key_cfg = new KeyBinding(Constants.BIND_WAILA_CFG, Keyboard.KEY_NUMPAD0, "Waila");
KeyHandler.key_show = new KeyBinding(Constants.BIND_WAILA_SHOW, Keyboard.KEY_NUMPAD1, "Waila");
KeyHandler.key_liquid = new KeyBinding(Constants.BIND_WAILA_LIQUID, Keyboard.KEY_NUMPAD2, "Waila");
Minecraft.getMinecraft().gameSettings.keyBindings = (KeyBinding[])ArrayUtils.addAll(
new KeyBinding[] {KeyHandler.key_cfg, KeyHandler.key_show, KeyHandler.key_liquid},
Minecraft.getMinecraft().gameSettings.keyBindings);
}
}
@@ -0,0 +1,14 @@
package mcp.mobius.waila.events;
import mcp.mobius.waila.network.Message0x00ServerPing;
import mcp.mobius.waila.network.WailaPacketHandler;
import net.minecraft.entity.player.EntityPlayerMP;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
public class NetworkHandler {
@SubscribeEvent
public void onPlayerLoggedIn(PlayerLoggedInEvent event){
WailaPacketHandler.INSTANCE.sendTo(new Message0x00ServerPing(), (EntityPlayerMP)event.player);
}
}
+84
View File
@@ -0,0 +1,84 @@
package mcp.mobius.waila.events;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.network.FMLOutboundHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.DataAccessor;
import mcp.mobius.waila.api.impl.Layout;
import mcp.mobius.waila.api.impl.MetaDataProvider;
import mcp.mobius.waila.network.Message0x00ServerPing;
import mcp.mobius.waila.network.WailaPacketHandler;
import mcp.mobius.waila.overlay.OverlayRenderer;
import mcp.mobius.waila.overlay.RayTracing;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemBlockWithMetadata;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
public class TickHandler {
//public static LangUtil lang = LangUtil.loadLangDir("waila");
private int ticks = 0;
public ItemStack identifiedHighlight;// = new ItemStack(Blocks.dirt);
public List<String> currenttip = new ArrayList<String>();
public MetaDataProvider handler = new MetaDataProvider();
private Minecraft mc = Minecraft.getMinecraft();
private static TickHandler _instance;
private TickHandler(){}
public static TickHandler instance(){
if(_instance == null)
_instance = new TickHandler();
return _instance;
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void tickRender(TickEvent.RenderTickEvent event) {
OverlayRenderer.instance().renderOverlay();
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void tickClient(TickEvent.ClientTickEvent event) {
World world = mc.theWorld;
EntityPlayer player = mc.thePlayer;
if (world != null && player != null){
RayTracing.instance().fire();
MovingObjectPosition target = RayTracing.instance().getTarget();
if (target != null){
DataAccessor accessor = DataAccessor.instance;
accessor.set(world, player, target);
ItemStack targetStack = RayTracing.instance().getTargetStack();
if (targetStack != null){
this.currenttip.clear();
//this.identifiedHighlight = handler.identifyHighlight(world, player, target);
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.HEADER);
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.BODY);
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.FOOTER);
}
}
}
}
}
@@ -3,7 +3,7 @@ package mcp.mobius.waila.gui.screens.config;
import org.lwjgl.util.Point;
import mcp.mobius.waila.Constants;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.gui.events.MouseEvent;
import mcp.mobius.waila.gui.interfaces.CType;
@@ -224,12 +224,12 @@ public class ScreenHUDConfig extends ScreenBase {
ConfigHandler.instance().setConfigInt(Constants.CFG_WAILA_ALPHA, (int)(this.getWidget("Layout").getWidget("Picture").getAlpha() * 100.0));
ConfigHandler.instance().setConfigInt(Constants.CFG_WAILA_SCALE, (int)(scale * 100.0));
mod_Waila.alpha = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_ALPHA);
mod_Waila.posX = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSX);
mod_Waila.posY = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSY);
mod_Waila.scale = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_SCALE) / 100.0f;
Waila.alpha = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_ALPHA);
Waila.posX = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSX);
Waila.posY = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSY);
Waila.scale = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_SCALE) / 100.0f;
mod_Waila.updateColors();
Waila.updateColors();
}
if (srcwidget.equals(this.getWidget("ButtonDefault")) && signal == Signal.CLICKED){
@@ -1,5 +1,6 @@
package mcp.mobius.waila.gui.widgets;
import mcp.mobius.waila.cbcore.ItemRenderer;
import mcp.mobius.waila.gui.interfaces.IWidget;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.item.ItemStack;
@@ -7,8 +8,6 @@ import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import org.lwjgl.util.Point;
import codechicken.nei.forge.GuiContainerManager;
public class ItemStackDisplay extends WidgetBase {
ItemStack stack = null;
@@ -42,7 +41,7 @@ public class ItemStackDisplay extends WidgetBase {
GL11.glScalef(scaleX, scaleY, 1.0f);
RenderHelper.enableGUIStandardItemLighting();
GuiContainerManager.drawItem((int)(pos.getX()/scaleX), (int)(pos.getY()/scaleX), this.stack);
ItemRenderer.drawItem((int)(pos.getX()/scaleX), (int)(pos.getY()/scaleX), this.stack);
GL11.glPopMatrix();
}
@@ -1,5 +1,6 @@
package mcp.mobius.waila.gui.widgets;
import mcp.mobius.waila.cbcore.LangUtil;
import mcp.mobius.waila.gui.interfaces.CType;
import mcp.mobius.waila.gui.interfaces.IWidget;
import mcp.mobius.waila.gui.interfaces.Signal;
@@ -8,8 +9,6 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.util.Point;
import codechicken.lib.lang.LangUtil;
public class LabelFixedFont extends WidgetBase {
protected String text = "";
@@ -6,6 +6,7 @@ import mcp.mobius.waila.gui.interfaces.IWidget;
import mcp.mobius.waila.gui.interfaces.Signal;
import mcp.mobius.waila.gui.widgets.LabelFixedFont;
import mcp.mobius.waila.gui.widgets.WidgetBase;
import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
@@ -66,7 +67,7 @@ public abstract class ButtonBase extends WidgetBase {
@Override
public void onMouseClick(MouseEvent event){
if (event.button == 0)
this.mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
this.mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
this.emit(Signal.CLICKED, event.button);
}
@@ -1,8 +1,8 @@
package mcp.mobius.waila.gui.widgets.buttons;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.Property;
import mcp.mobius.waila.mod_Waila;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.gui.events.MouseEvent;
import mcp.mobius.waila.gui.interfaces.IWidget;
@@ -20,8 +20,8 @@ public class ButtonBooleanConfig extends ButtonBoolean {
this.configKey = configKey;
this.instant = instant;
mod_Waila.instance.config.load();
Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, this.configKey, state_);
Waila.instance.config.load();
Property prop = Waila.instance.config.get(Configuration.CATEGORY_GENERAL, this.configKey, state_);
this.state = prop.getBoolean(state_);
if (this.state){
@@ -38,8 +38,8 @@ public class ButtonBooleanConfig extends ButtonBoolean {
super.onMouseClick(event);
if (this.instant){
mod_Waila.instance.config.getCategory(Configuration.CATEGORY_GENERAL).put(this.configKey, new Property(this.configKey,String.valueOf(this.state),Property.Type.BOOLEAN));
mod_Waila.instance.config.save();
Waila.instance.config.getCategory(Configuration.CATEGORY_GENERAL).put(this.configKey, new Property(this.configKey,String.valueOf(this.state),Property.Type.BOOLEAN));
Waila.instance.config.save();
}
}
@@ -3,9 +3,7 @@ package mcp.mobius.waila.gui.widgets.buttons;
import org.lwjgl.opengl.GL11;
import org.lwjgl.util.Point;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.Property;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.gui.events.MouseEvent;
import mcp.mobius.waila.gui.helpers.UIHelper;
import mcp.mobius.waila.gui.interfaces.IWidget;
@@ -19,7 +17,7 @@ public class ButtonBooleanConfigRemote extends ButtonBooleanConfig {
public ButtonBooleanConfigRemote(IWidget parent, String configKey, boolean instant, boolean state_, String textFalse, String textTrue){
super(parent, configKey, instant, state_, textFalse, textTrue);
if (!mod_Waila.instance.serverPresent)
if (!Waila.instance.serverPresent)
this.state = false;
if (this.state){
@@ -33,13 +31,13 @@ public class ButtonBooleanConfigRemote extends ButtonBooleanConfig {
@Override
public void onMouseClick(MouseEvent event){
if (mod_Waila.instance.serverPresent)
if (Waila.instance.serverPresent)
super.onMouseClick(event);
}
@Override
public void draw(Point pos) {
if (mod_Waila.instance.serverPresent)
if (Waila.instance.serverPresent)
super.draw(pos);
else{
this.saveGLState();
@@ -1,11 +1,11 @@
package mcp.mobius.waila.gui.widgets.buttons;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.Property;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import org.lwjgl.util.Point;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.gui.events.MouseEvent;
import mcp.mobius.waila.gui.interfaces.IWidget;
import mcp.mobius.waila.gui.widgets.WidgetBase;
@@ -24,8 +24,8 @@ public class ButtonIntegerConfig extends ButtonInteger {
this.configKey = configKey;
this.instant = instant;
mod_Waila.instance.config.load();
Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, this.configKey, state_);
Waila.instance.config.load();
Property prop = Waila.instance.config.get(Configuration.CATEGORY_GENERAL, this.configKey, state_);
this.state = prop.getInt();
for (int i = 0; i < this.nStates; i++)
@@ -39,8 +39,8 @@ public class ButtonIntegerConfig extends ButtonInteger {
super.onMouseClick(event);
if (this.instant){
mod_Waila.instance.config.getCategory(Configuration.CATEGORY_GENERAL).put(this.configKey, new Property(this.configKey,String.valueOf(this.state),Property.Type.INTEGER));
mod_Waila.instance.config.save();
Waila.instance.config.getCategory(Configuration.CATEGORY_GENERAL).put(this.configKey, new Property(this.configKey,String.valueOf(this.state),Property.Type.INTEGER));
Waila.instance.config.save();
}
}
+35 -4
View File
@@ -1,5 +1,6 @@
package mcp.mobius.waila.handlers;
import java.util.ArrayList;
import java.util.List;
import static mcp.mobius.waila.SpecialChars.*;
@@ -8,12 +9,16 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.tools.ModIdentification;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import codechicken.nei.forge.GuiContainerManager;
public class HUDHandlerWaila implements IWailaDataProvider {
//TODO : Redo id:metadata ??
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
@@ -25,7 +30,7 @@ public class HUDHandlerWaila implements IWailaDataProvider {
String name = null;
try
{
String s = GuiContainerManager.itemDisplayNameShort(itemStack);
String s = itemDisplayNameShort(itemStack);
if(s != null && !s.endsWith("Unnamed"))
name = s;
@@ -36,7 +41,7 @@ public class HUDHandlerWaila implements IWailaDataProvider {
{
}
if(itemStack.getItem() == Item.redstone)
if(itemStack.getItem() == Items.redstone)
{
int md = accessor.getMetadata();
String s = ""+md;
@@ -50,7 +55,7 @@ public class HUDHandlerWaila implements IWailaDataProvider {
else{
if (config.getConfig(Constants.CFG_WAILA_METADATA)){
name = currenttip.get(0);
currenttip.set(0, name + String.format(" %s:%s", accessor.getBlockID(), accessor.getMetadata()));
//currenttip.set(0, name + String.format(" %s:%s", accessor.getBlockID(), accessor.getMetadata()));
}
}
return currenttip;
@@ -69,4 +74,30 @@ public class HUDHandlerWaila implements IWailaDataProvider {
return currenttip;
}
public static String itemDisplayNameShort(ItemStack itemstack)
{
List<String> namelist = null;
try
{
namelist = itemstack.getTooltip(Minecraft.getMinecraft().thePlayer, false);
}
catch(Throwable t) {}
if(namelist == null)
namelist = new ArrayList<String>();
if(namelist.size() == 0)
namelist.add("Unnamed");
if(namelist.get(0) == null || namelist.get(0).equals(""))
namelist.set(0, "Unnamed");
namelist.set(0, "\247"+Integer.toHexString(itemstack.getRarity().rarityColor.ordinal())+namelist.get(0));
for(int i = 1; i < namelist.size(); i++)
namelist.set(i, "\u00a77"+namelist.get(i));
return namelist.get(0);
}
}
@@ -8,8 +8,8 @@ import java.util.LinkedHashMap;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.item.EnumArmorMaterial;
import net.minecraft.item.EnumToolMaterial;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
@@ -19,9 +19,9 @@ import mcp.mobius.waila.api.IWailaSummaryProvider;
public class SummaryProviderDefault implements IWailaSummaryProvider {
public SummaryProviderDefault() {
// TODO Auto-generated constructor stub
}
//TODO : Redo the case for ItemBlocks
public SummaryProviderDefault() { }
@Override
public LinkedHashMap<String, String> getSummary(ItemStack stack, LinkedHashMap<String, String> currentSummary, IWailaConfigHandler config) {
@@ -47,9 +47,10 @@ public class SummaryProviderDefault implements IWailaSummaryProvider {
currentSummary.put("Enchant", this.getArmorEnchantability(stack) != null?String.valueOf(this.getArmorEnchantability(stack)):null);
}
} else {
/*
//We have an ItemBlock
ItemBlock itemBlock = (ItemBlock)stack.getItem();
Block block = Block.blocksList[itemBlock.getBlockID()];
Block block = itemBlock.getBlock();
try{currentSummary.put("Hardness", String.valueOf(block.getBlockHardness(Minecraft.getMinecraft().theWorld, 0, 0, 0)));} catch (Exception e){};
try{currentSummary.put("Resistance", String.valueOf(block.getExplosionResistance(null)));} catch (Exception e){};
@@ -72,7 +73,8 @@ public class SummaryProviderDefault implements IWailaSummaryProvider {
for (int i=0; i < droppedStacks.size(); i++)
currentSummary.put(String.format("Sheared %s", i), droppedStacks.get(i).getDisplayName());
}
}catch (Exception e){System.out.printf("%s\n",e);};
}catch (Exception e){System.out.printf("%s\n",e);};
*/
}
@@ -80,34 +82,34 @@ public class SummaryProviderDefault implements IWailaSummaryProvider {
return currentSummary;
}
public EnumToolMaterial getToolMaterial(ItemStack stack){
public Item.ToolMaterial getToolMaterial(ItemStack stack){
Class itemClass = stack.getItem().getClass();
EnumToolMaterial material = null;
Item.ToolMaterial material = null;
try{
Field getMaterial = this.findField(itemClass, "toolMaterial");
if (getMaterial != null){
getMaterial.setAccessible(true);
material = (EnumToolMaterial)(getMaterial.get(stack.getItem()));
material = (Item.ToolMaterial)(getMaterial.get(stack.getItem()));
}
} catch (Exception e){}
return material;
}
public EnumArmorMaterial getArmorMaterial(ItemStack stack){
public ItemArmor.ArmorMaterial getArmorMaterial(ItemStack stack){
Class itemClass = stack.getItem().getClass();
EnumArmorMaterial material = null;
ItemArmor.ArmorMaterial material = null;
try{
Field getMaterial = this.findField(itemClass, "material");
if (getMaterial != null){
getMaterial.setAccessible(true);
material = (EnumArmorMaterial)(getMaterial.get(stack.getItem()));
material = (ItemArmor.ArmorMaterial)(getMaterial.get(stack.getItem()));
}
} catch (Exception e){}
return material;
}
public String getToolMaterialName(ItemStack stack){
EnumToolMaterial material = this.getToolMaterial(stack);
Item.ToolMaterial material = this.getToolMaterial(stack);
if (material == null)
return null;
@@ -123,7 +125,7 @@ public class SummaryProviderDefault implements IWailaSummaryProvider {
}
public String getArmorMaterialName(ItemStack stack){
EnumArmorMaterial material = this.getArmorMaterial(stack);
ItemArmor.ArmorMaterial material = this.getArmorMaterial(stack);
if (material == null)
return null;
@@ -147,14 +149,14 @@ public class SummaryProviderDefault implements IWailaSummaryProvider {
Collections.addAll(effectiveBlocks, effectiveBlocksArray);
String effectiveAgainst = "";
if (effectiveBlocks.contains(Block.obsidian))
effectiveAgainst = Block.obsidian.getLocalizedName();
else if (effectiveBlocks.contains(Block.stone))
effectiveAgainst = Block.stone.getLocalizedName();
else if (effectiveBlocks.contains(Block.dirt))
effectiveAgainst = Block.dirt.getLocalizedName();
else if (effectiveBlocks.contains(Block.wood))
effectiveAgainst = Block.wood.getLocalizedName();
if (effectiveBlocks.contains(Blocks.obsidian))
effectiveAgainst = Blocks.obsidian.getLocalizedName();
else if (effectiveBlocks.contains(Blocks.stone))
effectiveAgainst = Blocks.stone.getLocalizedName();
else if (effectiveBlocks.contains(Blocks.dirt))
effectiveAgainst = Blocks.dirt.getLocalizedName();
else if (effectiveBlocks.contains(Blocks.log))
effectiveAgainst = Blocks.log.getLocalizedName();
return effectiveAgainst.equals("")?null:effectiveAgainst;
}catch (Exception e){}
@@ -162,22 +164,22 @@ public class SummaryProviderDefault implements IWailaSummaryProvider {
}
public Integer getHarvestLevel(ItemStack stack){
EnumToolMaterial material = this.getToolMaterial(stack);
Item.ToolMaterial material = this.getToolMaterial(stack);
return material!=null?material.getHarvestLevel():null;
}
public Float getEfficiencyOnProperMaterial(ItemStack stack){
EnumToolMaterial material = this.getToolMaterial(stack);
Item.ToolMaterial material = this.getToolMaterial(stack);
return material!=null?material.getEfficiencyOnProperMaterial():null;
}
public Integer getToolEnchantability(ItemStack stack){
EnumToolMaterial material = this.getToolMaterial(stack);
Item.ToolMaterial material = this.getToolMaterial(stack);
return material!=null?material.getEnchantability():null;
}
public Float getDamageVsEntity(ItemStack stack){
EnumToolMaterial material = this.getToolMaterial(stack);
Item.ToolMaterial material = this.getToolMaterial(stack);
return material!=null?material.getDamageVsEntity():null;
}
@@ -194,7 +196,7 @@ public class SummaryProviderDefault implements IWailaSummaryProvider {
}
public Integer getArmorEnchantability(ItemStack stack){
EnumArmorMaterial material = this.getArmorMaterial(stack);
ItemArmor.ArmorMaterial material = this.getArmorMaterial(stack);
return material!=null?material.getEnchantability():null;
}
@@ -0,0 +1,9 @@
package mcp.mobius.waila.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
public interface IWailaMessage {
public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception;
public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg);
}
@@ -0,0 +1,25 @@
package mcp.mobius.waila.network;
import cpw.mods.fml.relauncher.Side;
import mcp.mobius.waila.Waila;
import net.minecraft.network.Packet;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
public class Message0x00ServerPing extends SimpleChannelInboundHandler<Message0x00ServerPing> implements IWailaMessage {
@Override
public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception {
}
@Override
public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) {
}
@Override
protected void channelRead0(ChannelHandlerContext ctx, Message0x00ServerPing msg) throws Exception {
Waila.log.info("Received server authentication msg. Remote sync will be activated");
Waila.instance.serverPresent = true;
}
}
@@ -0,0 +1,65 @@
package mcp.mobius.waila.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import mcp.mobius.waila.WailaExceptionHandler;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.Packet;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.DimensionManager;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x01TERequest> implements IWailaMessage {
public int dim;
public int posX;
public int posY;
public int posZ;
public Message0x01TERequest(){}
public Message0x01TERequest(TileEntity ent){
this.dim = ent.getWorldObj().provider.dimensionId;
this.posX = ent.xCoord;
this.posY = ent.yCoord;
this.posZ = ent.zCoord;
}
@Override
public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception {
target.writeInt(dim);
target.writeInt(posX);
target.writeInt(posY);
target.writeInt(posZ);
}
@Override
public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) {
Message0x01TERequest msg = (Message0x01TERequest)rawmsg;
msg.dim = dat.readInt();
msg.posX = dat.readInt();
msg.posY = dat.readInt();
msg.posZ = dat.readInt();
}
@Override
protected void channelRead0(ChannelHandlerContext ctx, Message0x01TERequest msg) throws Exception {
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
TileEntity entity = DimensionManager.getWorld(msg.dim).getTileEntity(msg.posX, msg.posY, msg.posZ);
if (entity != null){
try{
NBTTagCompound tag = new NBTTagCompound();
entity.writeToNBT(tag);
ctx.writeAndFlush(new Message0x02TENBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
}catch(Throwable e){
WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
}
}
}
}
@@ -0,0 +1,41 @@
package mcp.mobius.waila.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.api.impl.DataAccessor;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.Packet;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side;
public class Message0x02TENBTData extends SimpleChannelInboundHandler<Message0x02TENBTData> implements IWailaMessage {
NBTTagCompound tag;
public Message0x02TENBTData(){}
public Message0x02TENBTData(NBTTagCompound tag){
this.tag = tag;
}
@Override
public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception {
WailaPacketHandler.INSTANCE.writeNBTTagCompoundToBuffer(target, tag);
}
@Override
public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) {
try{
this.tag = WailaPacketHandler.INSTANCE.readNBTTagCompoundFromBuffer(dat);
} catch (Exception e){
WailaExceptionHandler.handleErr(e, this.getClass().toString(), null);
}
}
@Override
protected void channelRead0(ChannelHandlerContext ctx, Message0x02TENBTData msg) throws Exception {
DataAccessor.instance.remoteNbt = msg.tag;
}
}
@@ -1,39 +0,0 @@
package mcp.mobius.waila.network;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.network.packet.Packet250CustomPayload;
public class Packet0x00ServerPing {
public byte header;
public Packet0x00ServerPing(Packet250CustomPayload packet){
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
try{
this.header = inputStream.readByte();
} catch (IOException e){}
}
public static Packet250CustomPayload create(){
Packet250CustomPayload packet = new Packet250CustomPayload();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
DataOutputStream outputStream = new DataOutputStream(bos);
try{
outputStream.writeByte(0x00);
}catch(IOException e){}
packet.channel = "Waila";
packet.data = bos.toByteArray();
packet.length = bos.size();
return packet;
}
}
@@ -1,51 +0,0 @@
package mcp.mobius.waila.network;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class Packet0x01TERequest {
public byte header;
public int worldID;
public int posX;
public int posY;
public int posZ;
public Packet0x01TERequest(Packet250CustomPayload packet){
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
try{
this.header = inputStream.readByte();
this.worldID = inputStream.readInt();
this.posX = inputStream.readInt();
this.posY = inputStream.readInt();
this.posZ = inputStream.readInt();
} catch (IOException e){}
}
public static Packet250CustomPayload create(World world, MovingObjectPosition mop){
Packet250CustomPayload packet = new Packet250CustomPayload();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4);
DataOutputStream outputStream = new DataOutputStream(bos);
try{
outputStream.writeByte(0x01);
outputStream.writeInt(world.provider.dimensionId);
outputStream.writeInt(mop.blockX);
outputStream.writeInt(mop.blockY);
outputStream.writeInt(mop.blockZ);
}catch(IOException e){}
packet.channel = "Waila";
packet.data = bos.toByteArray();
packet.length = bos.size();
return packet;
}
}
@@ -1,77 +0,0 @@
package mcp.mobius.waila.network;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet250CustomPayload;
public class Packet0x02TENBTData {
public byte header;
public NBTTagCompound tag;
public Packet0x02TENBTData(Packet250CustomPayload packet){
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
try{
this.header = inputStream.readByte();
this.tag = Packet0x02TENBTData.readNBTTagCompound(inputStream);
} catch (IOException e){}
}
public static Packet250CustomPayload create(NBTTagCompound tag){
Packet250CustomPayload packet = new Packet250CustomPayload();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4);
DataOutputStream outputStream = new DataOutputStream(bos);
try{
outputStream.writeByte(0x02);
Packet0x02TENBTData.writeNBTTagCompound(tag, outputStream);
}catch(IOException e){}
packet.channel = "Waila";
packet.data = bos.toByteArray();
packet.length = bos.size();
return packet;
}
public static void writeNBTTagCompound(NBTTagCompound par0NBTTagCompound, DataOutputStream par1DataOutputStream) throws IOException
{
if (par0NBTTagCompound == null)
{
par1DataOutputStream.writeShort(-1);
}
else
{
byte[] abyte = CompressedStreamTools.compress(par0NBTTagCompound);
if (abyte.length > 32000)
par1DataOutputStream.writeShort(-1);
else{
par1DataOutputStream.writeShort((short)abyte.length);
par1DataOutputStream.write(abyte);
}
}
}
public static NBTTagCompound readNBTTagCompound(DataInputStream par0DataInputStream) throws IOException
{
short short1 = par0DataInputStream.readShort();
if (short1 < 0)
{
return null;
}
else
{
byte[] abyte = new byte[short1];
par0DataInputStream.readFully(abyte);
return CompressedStreamTools.decompress(abyte);
}
}
}
@@ -1,40 +0,0 @@
package mcp.mobius.waila.network;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.NetLoginHandler;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet1Login;
import net.minecraft.server.MinecraftServer;
import cpw.mods.fml.common.network.IConnectionHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class WailaConnectionHandler implements IConnectionHandler {
@Override
public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) {
PacketDispatcher.sendPacketToPlayer(Packet0x00ServerPing.create(), player);
}
@Override
public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) {
return null;
}
@Override
public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) {
}
@Override
public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager) {
}
@Override
public void connectionClosed(INetworkManager manager) {
}
@Override
public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) {
}
}
@@ -1,69 +1,108 @@
package mcp.mobius.waila.network;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import java.io.IOException;
import java.util.EnumMap;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.api.impl.DataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.DimensionManager;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
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.common.network.simpleimpl.IMessage;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class WailaPacketHandler implements IPacketHandler {
@Override
public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player){
try{
if (packet.channel.equals("Waila")) {
public enum WailaPacketHandler {
INSTANCE;
byte header = this.getHeader(packet);
if (header == 0x00){
mod_Waila.log.info("Received server authentication msg. Remote sync will be activated");
mod_Waila.instance.serverPresent = true;
}
else if (header == 0x01){
Packet0x01TERequest castedPacket = new Packet0x01TERequest(packet);
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
TileEntity entity = DimensionManager.getWorld(castedPacket.worldID).getBlockTileEntity(castedPacket.posX, castedPacket.posY, castedPacket.posZ);
//TileEntity entity = server.worldServers[castedPacket.worldID].getBlockTileEntity(castedPacket.posX, castedPacket.posY, castedPacket.posZ);
if (entity != null){
try{
NBTTagCompound tag = new NBTTagCompound();
entity.writeToNBT(tag);
PacketDispatcher.sendPacketToPlayer(Packet0x02TENBTData.create(tag), player);
}catch(Throwable e){
WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
}
}
}
else if (header == 0x02){
Packet0x02TENBTData castedPacket = new Packet0x02TENBTData(packet);
DataAccessor.instance.remoteNbt = castedPacket.tag;
}
}
}
catch (Exception e){
return;
}
}
public EnumMap<Side, FMLEmbeddedChannel> channels;
private WailaPacketHandler(){
this.channels = NetworkRegistry.INSTANCE.newChannel("Waila", new WailaCodec());
if (FMLCommonHandler.instance().getSide() == Side.CLIENT){
addClientHandlers();
addServerHandlers();
}else{
addServerHandlers();
}
}
public byte getHeader(Packet250CustomPayload packet){
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
try{
return inputStream.readByte();
} catch (IOException e){
return -1;
}
}
private void addClientHandlers(){
FMLEmbeddedChannel channel = this.channels.get(Side.CLIENT);
String codec = channel.findChannelHandlerNameForType(WailaCodec.class);
channel.pipeline().addAfter(codec, "ServerPing", new Message0x00ServerPing());
channel.pipeline().addAfter("ServerPing", "TENBTData", new Message0x02TENBTData());
}
private void addServerHandlers(){
FMLEmbeddedChannel channel = this.channels.get(Side.SERVER);
String codec = channel.findChannelHandlerNameForType(WailaCodec.class);
channel.pipeline().addAfter(codec, "TERequest", new Message0x01TERequest());
}
private class WailaCodec extends FMLIndexedMessageToMessageCodec<IWailaMessage>
{
public WailaCodec()
{
addDiscriminator(0, Message0x00ServerPing.class);
addDiscriminator(1, Message0x01TERequest.class);
addDiscriminator(2, Message0x02TENBTData.class);
}
@Override
public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception
{
msg.encodeInto(ctx, msg, target);
}
@Override
public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg)
{
msg.decodeInto(ctx, dat, msg);
}
}
public void sendTo(IWailaMessage message, EntityPlayerMP player){
channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER);
channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player);
channels.get(Side.SERVER).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
}
public void sendToServer(IWailaMessage message){
channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER);
channels.get(Side.CLIENT).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
}
public void writeNBTTagCompoundToBuffer(ByteBuf target, NBTTagCompound tag) throws IOException{
if (tag == null)
target.writeShort(-1);
else{
byte[] abyte = CompressedStreamTools.compress(tag);
target.writeShort((short)abyte.length);
target.writeBytes(abyte);
}
}
public NBTTagCompound readNBTTagCompoundFromBuffer(ByteBuf dat) throws IOException
{
short short1 = dat.readShort();
if (short1 < 0)
return null;
else{
byte[] abyte = new byte[short1];
dat.readBytes(abyte);
return CompressedStreamTools.decompress(abyte);
}
}
}
+66 -47
View File
@@ -1,12 +1,14 @@
package mcp.mobius.waila.overlay;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import codechicken.nei.forge.GuiContainerManager;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
@@ -15,46 +17,63 @@ import java.awt.Dimension;
import java.awt.Point;
import mcp.mobius.waila.Constants;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.cbcore.GuiDraw;
import mcp.mobius.waila.cbcore.ItemRenderer;
import mcp.mobius.waila.events.TickHandler;
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumMovingObjectType;
import static codechicken.core.gui.GuiDraw.*;
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.client.ForgeHooksClient;
public class OverlayRenderer {
protected static boolean hasBlending;
protected static boolean hasLight;
protected static int boundTexIndex;
//TODO : Readd entity name
public static void renderOverlay()
private static OverlayRenderer _instance;
private OverlayRenderer(){};
public static OverlayRenderer instance(){
return _instance == null ? new OverlayRenderer() : _instance;
}
protected boolean hasBlending;
protected boolean hasLight;
protected int boundTexIndex;
public void renderOverlay()
{
Minecraft mc = Minecraft.getMinecraft();
if(!(mc.currentScreen == null &&
mc.theWorld != null &&
mc.isGuiEnabled() &&
!mc.gameSettings.keyBindPlayerList.pressed &&
!mc.gameSettings.keyBindPlayerList.getIsKeyPressed() &&
ConfigHandler.instance().getConfig(Constants.CFG_WAILA_SHOW, true) &&
RayTracing.instance().getTarget() != null))
return;
if (RayTracing.instance().getTarget().typeOfHit == EnumMovingObjectType.TILE && RayTracing.instance().getTargetStack() != null)
if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && RayTracing.instance().getTargetStack() != null)
{
renderOverlay(RayTracing.instance().getTargetStack(), WailaTickHandler.instance().currenttip, getPositioning());
renderOverlay(RayTracing.instance().getTargetStack(), TickHandler.instance().currenttip, getPositioning());
}
if (RayTracing.instance().getTarget().typeOfHit == EnumMovingObjectType.ENTITY)
if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY)
{
Entity ent = RayTracing.instance().getTarget().entityHit;
String modName = getEntityMod(ent);
List<String> textData = new ArrayList<String>();
try{
textData.add("\u00a7f" + ent.getEntityName());
//textData.add("\u00a7f" + ent.getEntityName());
textData.add("\u00a7f" + "To be done");
} catch (Exception e){
textData.add("\u00a7f" + "Unknown");
}
@@ -64,7 +83,7 @@ public class OverlayRenderer {
}
}
private static String getEntityMod(Entity entity){
private String getEntityMod(Entity entity){
String modName = "";
try{
EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), true);
@@ -76,7 +95,7 @@ public class OverlayRenderer {
return modName;
}
private static Point getPositioning()
private Point getPositioning()
{
return new Point(ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSX), ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSY));
}
@@ -88,29 +107,29 @@ public class OverlayRenderer {
}
*/
public static void renderOverlay(ItemStack stack, List<String> textData, Point pos)
public void renderOverlay(ItemStack stack, List<String> textData, Point pos)
{
TrueTypeFont font = (TrueTypeFont)mod_Waila.proxy.getFont();
TrueTypeFont font = (TrueTypeFont)Waila.proxy.getFont();
GL11.glPushMatrix();
GL11.glScalef(mod_Waila.scale, mod_Waila.scale, 1.0f);
GL11.glScalef(Waila.scale, Waila.scale, 1.0f);
int w = 0;
for (String s : textData)
w = Math.max(w, getStringWidth(s)+29);
w = Math.max(w, GuiDraw.getStringWidth(s)+29);
int h = Math.max(24, 10 + 10*textData.size());
Dimension size = displaySize();
int x = ((int)(size.width / mod_Waila.scale)-w-1)*pos.x/10000;
int y = ((int)(size.height / mod_Waila.scale)-h-1)*pos.y/10000;
Dimension size = GuiDraw.displaySize();
int x = ((int)(size.width / Waila.scale)-w-1)*pos.x/10000;
int y = ((int)(size.height / Waila.scale)-h-1)*pos.y/10000;
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST);
drawTooltipBox(x, y, w, h, mod_Waila.bgcolor, mod_Waila.gradient1, mod_Waila.gradient2);
drawTooltipBox(x, y, w, h, Waila.bgcolor, Waila.gradient1, Waila.gradient2);
int ty = (h-10*textData.size())/2;
@@ -118,47 +137,48 @@ public class OverlayRenderer {
GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA);
for (int i = 0; i < textData.size(); i++)
//FontHelper.drawString(textData.get(i), x + 24, y + ty + 10*i, font, 1.0f, 1.0f, new float[] {1.0f, 1.0f, 1.0f});
drawString(textData.get(i), x + 24, y + ty + 10*i, mod_Waila.fontcolor, true);
GuiDraw.drawString(textData.get(i), x + 24, y + ty + 10*i, Waila.fontcolor, true);
GL11.glDisable(GL11.GL_BLEND);
RenderHelper.enableGUIStandardItemLighting();
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
if (stack.getItem() != null)
GuiContainerManager.drawItem(x+5, y+h/2-8, stack);
if (stack.getItem() != null){
ItemRenderer.drawItem(x+5, y+h/2-8, stack);
}
GL11.glPopMatrix();
}
public static void renderOverlay(Entity entity, List<String> textData, Point pos)
public void renderOverlay(Entity entity, List<String> textData, Point pos)
{
GL11.glPushMatrix();
GL11.glScalef(mod_Waila.scale, mod_Waila.scale, 1.0f);
GL11.glScalef(Waila.scale, Waila.scale, 1.0f);
int w = 0;
for (String s : textData)
w = Math.max(w, getStringWidth(s)+10);
w = Math.max(w, GuiDraw.getStringWidth(s)+10);
int h = Math.max(24, 10 + 10*textData.size());
Dimension size = displaySize();
int x = ((int)(size.width / mod_Waila.scale)-w-1)*pos.x/10000;
int y = ((int)(size.height / mod_Waila.scale)-h-1)*pos.y/10000;
Dimension size = GuiDraw.displaySize();
int x = ((int)(size.width / Waila.scale)-w-1)*pos.x/10000;
int y = ((int)(size.height / Waila.scale)-h-1)*pos.y/10000;
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST);
drawTooltipBox(x, y, w, h, mod_Waila.bgcolor, mod_Waila.gradient1, mod_Waila.gradient2);
drawTooltipBox(x, y, w, h, Waila.bgcolor, Waila.gradient1, Waila.gradient2);
int ty = (h-10*textData.size())/2;
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA);
for (int i = 0; i < textData.size(); i++)
drawString(textData.get(i), x + 6, y + ty + 10*i, mod_Waila.fontcolor, true);
GuiDraw.drawString(textData.get(i), x + 6, y + ty + 10*i, Waila.fontcolor, true);
GL11.glDisable(GL11.GL_BLEND);
//RenderHelper.enableGUIStandardItemLighting();
@@ -167,14 +187,14 @@ public class OverlayRenderer {
GL11.glPopMatrix();
}
public static void saveGLState(){
public void saveGLState(){
hasBlending = GL11.glGetBoolean(GL11.GL_BLEND);
hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING);
boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
GL11.glPushAttrib(GL11.GL_CURRENT_BIT);
}
public static void loadGLState(){
public void loadGLState(){
if (hasBlending) GL11.glEnable(GL11.GL_BLEND); else GL11.glDisable(GL11.GL_BLEND);
if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); else GL11.glDisable(GL11.GL_LIGHTING);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex);
@@ -182,21 +202,20 @@ public class OverlayRenderer {
//GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
}
public static void drawTooltipBox(int x, int y, int w, int h, int bg, int grad1, int grad2)
public void drawTooltipBox(int x, int y, int w, int h, int bg, int grad1, int grad2)
{
//int bg = 0xf0100010;
drawGradientRect(x + 1, y, w - 1, 1, bg, bg);
drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg);
drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg);//center
drawGradientRect(x, y + 1, 1, h - 1, bg, bg);
drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg);
GuiDraw.drawGradientRect(x + 1, y, w - 1, 1, bg, bg);
GuiDraw.drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg);
GuiDraw.drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg);//center
GuiDraw.drawGradientRect(x, y + 1, 1, h - 1, bg, bg);
GuiDraw.drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg);
//int grad1 = 0x505000ff;
//int grad2 = 0x5028007F;
drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2);
drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2);
GuiDraw.drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2);
GuiDraw.drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2);
drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1);
drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2);
GuiDraw.drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1);
GuiDraw.drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2);
}
}
+14 -30
View File
@@ -12,9 +12,9 @@ import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
@@ -35,7 +35,7 @@ public class RayTracing {
private Minecraft mc = Minecraft.getMinecraft();
public void fire(){
if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == EnumMovingObjectType.ENTITY){
if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY){
this.target = mc.objectMouseOver;
this.targetStack = null;
return;
@@ -54,7 +54,7 @@ public class RayTracing {
}
public ItemStack getTargetStack(){
if (this.target.typeOfHit == EnumMovingObjectType.TILE)
if (this.target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
this.targetStack = this.getIdentifierStack();
else
this.targetStack = null;
@@ -69,9 +69,9 @@ public class RayTracing {
Vec3 vec32 = vec3.addVector(vec31.xCoord * par1, vec31.yCoord * par1, vec31.zCoord * par1);
if (ConfigHandler.instance().getConfig(Constants.CFG_WAILA_LIQUID))
return entity.worldObj.clip(vec3, vec32, true);
return entity.worldObj.rayTraceBlocks(vec3, vec32, true);
else
return entity.worldObj.clip(vec3, vec32, false);
return entity.worldObj.rayTraceBlocks(vec3, vec32, false);
}
public ItemStack getIdentifierStack(){
@@ -105,33 +105,16 @@ public class RayTracing {
int x = this.target.blockX;
int y = this.target.blockY;
int z = this.target.blockZ;
int blockID = world.getBlockId(x, y, z);
Block mouseoverBlock = Block.blocksList[blockID];
Block mouseoverBlock = world.getBlock(x, y, z);
if (mouseoverBlock == null) return items;
// TODO This block need to be redone to handle Waila API
/*
ArrayList<IHighlightHandler> handlers = new ArrayList<IHighlightHandler>();
if(ItemInfo.highlightIdentifiers.get(0) != null)
handlers.addAll(ItemInfo.highlightIdentifiers.get(0));
if(ItemInfo.highlightIdentifiers.get(mouseoverBlock.blockID) != null)
handlers.addAll(ItemInfo.highlightIdentifiers.get(mouseoverBlock.blockID));
for(IHighlightHandler ident : handlers)
{
ItemStack item = ident.identifyHighlight(world, player, this.target);
if(item != null)
items.add(item);
}
*/
if (ModuleRegistrar.instance().hasStackProviders(blockID))
items.add(ModuleRegistrar.instance().getStackProviders(blockID).get(0).getWailaStack(DataAccessor.instance, ConfigHandler.instance()));
if (ModuleRegistrar.instance().hasStackProviders(mouseoverBlock))
items.add(ModuleRegistrar.instance().getStackProviders(mouseoverBlock).get(0).getWailaStack(DataAccessor.instance, ConfigHandler.instance()));
if(items.size() > 0)
return items;
if (world.getBlockTileEntity(x, y, z) == null){
if (world.getTileEntity(x, y, z) == null){
try{
ItemStack block = new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z));
items.add(block);
@@ -153,7 +136,8 @@ public class RayTracing {
try
{
items.addAll(mouseoverBlock.getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0));
//items.addAll(mouseoverBlock.getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0));
items.addAll(mouseoverBlock.getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0));
}
catch(Exception e){}
@@ -163,9 +147,9 @@ public class RayTracing {
if(mouseoverBlock instanceof IShearable)
{
IShearable shearable = (IShearable)mouseoverBlock;
if(shearable.isShearable(new ItemStack(Item.shears), world, x, y, z))
if(shearable.isShearable(new ItemStack(Items.shears), world, x, y, z))
{
items.addAll(shearable.onSheared(new ItemStack(Item.shears), world, x, y, z, 0));
items.addAll(shearable.onSheared(new ItemStack(Items.shears), world, x, y, z, 0));
}
}
@@ -1,87 +0,0 @@
package mcp.mobius.waila.overlay;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import mcp.mobius.waila.api.impl.DataAccessor;
import mcp.mobius.waila.api.impl.MetaDataProvider;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemBlockWithMetadata;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import codechicken.nei.api.ItemInfo.Layout;
import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType;
public class WailaTickHandler implements ITickHandler {
//public static LangUtil lang = LangUtil.loadLangDir("waila");
private int ticks = 0;
public ItemStack identifiedHighlight = new ItemStack(Block.dirt);
public List<String> currenttip = new ArrayList<String>();
public MetaDataProvider handler = new MetaDataProvider();
private Minecraft mc = Minecraft.getMinecraft();
private static WailaTickHandler _instance;
private WailaTickHandler(){}
public static WailaTickHandler instance(){
if(_instance == null)
_instance = new WailaTickHandler();
return _instance;
}
@Override
public void tickStart(EnumSet<TickType> type, Object... tickData) {
}
@Override
public void tickEnd(EnumSet<TickType> type, Object... tickData) {
if(type.contains(TickType.RENDER)){
OverlayRenderer.renderOverlay();
}
if(type.contains(TickType.CLIENT)){
World world = mc.theWorld;
EntityPlayer player = mc.thePlayer;
if (world != null && player != null){
RayTracing.instance().fire();
MovingObjectPosition target = RayTracing.instance().getTarget();
if (target != null){
DataAccessor accessor = DataAccessor.instance;
accessor.set(world, player, target);
ItemStack targetStack = RayTracing.instance().getTargetStack();
if (targetStack != null){
this.currenttip.clear();
//this.identifiedHighlight = handler.identifyHighlight(world, player, target);
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.HEADER);
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.BODY);
this.currenttip = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.FOOTER);
}
}
}
}
}
@Override
public EnumSet<TickType> ticks()
{
return EnumSet.of(TickType.RENDER, TickType.CLIENT);
}
@Override
public String getLabel()
{
return "Waila Tick Handler";
}
}
+33 -14
View File
@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -21,19 +21,19 @@ public class AccessHelper {
Class class_ = Class.forName(classname);
Field field_ = class_.getDeclaredField(fieldname);
field_.setAccessible(true);
mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname));
Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname));
return field_;
}
catch (NoSuchFieldException e) {
mod_Waila.log.warning(String.format("== Field %s %s not found !\n", classname, fieldname));
Waila.log.warning(String.format("== Field %s %s not found !\n", classname, fieldname));
return null;
}
catch (SecurityException e) {
mod_Waila.log.warning(String.format("== Field %s %s security exception !\n", classname, fieldname));
Waila.log.warning(String.format("== Field %s %s security exception !\n", classname, fieldname));
return null;
}
catch (ClassNotFoundException e) {
mod_Waila.log.warning(String.format("== Class %s not found !\n", classname));
Waila.log.warning(String.format("== Class %s not found !\n", classname));
return null;
}
}
@@ -45,25 +45,25 @@ public class AccessHelper {
Field field_ = class_.getDeclaredField(fieldname);
field_.setAccessible(true);
mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname));
Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname));
return field_.get(instance);
}
catch (NoSuchFieldException e) {
mod_Waila.log.warning(String.format("== Field %s %s not found !\n", classname, fieldname));
Waila.log.warning(String.format("== Field %s %s not found !\n", classname, fieldname));
return null;
}
catch (SecurityException e) {
mod_Waila.log.warning(String.format("== Field %s %s security exception !\n", classname, fieldname));
Waila.log.warning(String.format("== Field %s %s security exception !\n", classname, fieldname));
return null;
}
catch (ClassNotFoundException e) {
mod_Waila.log.warning(String.format("== Class %s not found !\n", classname));
Waila.log.warning(String.format("== Class %s not found !\n", classname));
return null;
} catch (IllegalArgumentException e) {
mod_Waila.log.warning(String.format("== %s\n", e));
Waila.log.warning(String.format("== %s\n", e));
return null;
} catch (IllegalAccessException e) {
mod_Waila.log.warning(String.format("== %s\n", e));
Waila.log.warning(String.format("== %s\n", e));
return null;
}
}
@@ -74,7 +74,7 @@ public class AccessHelper {
Field field_ = class_.getDeclaredField(fieldname);
field_.setAccessible(true);
mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname));
Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname));
return field_.get(instance);
}
@@ -85,7 +85,7 @@ public class AccessHelper {
return (Block)field_.get(Block.class);
} catch (Exception e) {
System.out.printf("%s\n", e);
mod_Waila.log.warning(String.format("== ERROR GETTING BLOCK %s %s\n", classname, fieldname));
Waila.log.warning(String.format("== ERROR GETTING BLOCK %s %s\n", classname, fieldname));
return null;
}
}
@@ -96,7 +96,7 @@ public class AccessHelper {
return (Item)field_.get(Item.class);
} catch (Exception e) {
System.out.printf("%s\n", e);
mod_Waila.log.warning(String.format("== ERROR GETTING ITEM %s %s\n", classname, fieldname));
Waila.log.warning(String.format("== ERROR GETTING ITEM %s %s\n", classname, fieldname));
return null;
}
}
@@ -120,6 +120,7 @@ public class AccessHelper {
}
}
/*
public static void cleanSmeltingRecipes(ItemStack stack){
Map smeltingList = FurnaceRecipes.smelting().getSmeltingList();
Map<List<Integer>, ItemStack> smeltingListMeta = FurnaceRecipes.smelting().getMetaSmeltingList();
@@ -149,5 +150,23 @@ public class AccessHelper {
for (List<Integer> key : matchingRecipesMeta.keySet())
FurnaceRecipes.smelting().getMetaSmeltingList().remove(key);
}
*/
/*
public static Object getFieldValue(String className, String fieldname, Object obj){
try {
Class class_ = Class.forName(className);
Field field_ = class_.getField(fieldname);
field_.setAccessible(true);
Object object_ = field_.get(obj);
return object_;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
*/
}
+30 -22
View File
@@ -7,14 +7,10 @@ import java.util.HashMap;
import java.util.Set;
import java.util.logging.Level;
import codechicken.core.CommonUtils;
import cpw.mods.fml.client.registry.KeyBindingRegistry;
import cpw.mods.fml.client.registry.KeyBindingRegistry.KeyHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.ItemData;
import mcp.mobius.waila.mod_Waila;
import mcp.mobius.waila.Waila;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -22,13 +18,15 @@ import net.minecraft.nbt.NBTTagList;
public class ModIdentification {
public static HashMap<String, String> modSource_Name = new HashMap<String, String>();
public static HashMap<String, String> modSource_ID = new HashMap<String, String>();
public static HashMap<Integer, String> itemMap = new HashMap<Integer, String>();
public static HashMap<String, String> modSource_Name = new HashMap<String, String>();
public static HashMap<String, String> modSource_ID = new HashMap<String, String>();
public static HashMap<Integer, String> itemMap = new HashMap<Integer, String>();
public static HashMap<String, String> keyhandlerStrings = new HashMap<String, String>();
public static void init(){
//TODO : Redo this for the new frameworkn (1.7.2)
/*
NBTTagList itemDataList = new NBTTagList();
GameData.writeItemData(itemDataList);
@@ -42,7 +40,9 @@ public class ModIdentification {
modSource_Name.put(mod.getSource().getName(), mod.getName());
modSource_ID.put(mod.getSource().getName(), mod.getModId());
}
*/
//TODO : Update this to match new version (1.7.2)
modSource_Name.put("1.6.2.jar", "Minecraft");
modSource_Name.put("1.6.3.jar", "Minecraft");
modSource_Name.put("1.6.4.jar", "Minecraft");
@@ -58,6 +58,7 @@ public class ModIdentification {
// this.modSourceList.put(s, "Minecraft");
// Code to retrieve all the registered keybindings along with the mod adding them.
/*
Field keyHandlers_Field = AccessHelper.getDeclaredField("cpw.mods.fml.client.registry.KeyBindingRegistry", "keyHandlers");
try {
Set<KeyHandler> keyHandlers = (Set<KeyHandler>)keyHandlers_Field.get(KeyBindingRegistry.instance());
@@ -68,10 +69,12 @@ public class ModIdentification {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
*/
}
/*
public static String nameFromObject(Object obj){
String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString();
@@ -93,7 +96,9 @@ public class ModIdentification {
return modName;
}
*/
/*
public static String idFromObject(Object obj){
String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString();
@@ -116,12 +121,14 @@ public class ModIdentification {
return modName;
}
*/
public static String nameFromStack(ItemStack itemstack){
public static String nameFromStack(ItemStack stack){
try{
String modID = itemMap.get(itemstack.itemID);
ModContainer mod = CommonUtils.findModContainer(modID);
String modname = mod == null ? modID : mod.getName();
//String modID = itemMap.get(itemstack.itemID);
//ModContainer mod = ModIdentification.findModContainer(modID);
ModContainer mod = GameData.findModOwner(GameData.itemRegistry.getNameForObject(stack.getItem()));
String modname = mod == null ? "Minecraft" : mod.getName();
return modname;
} catch (NullPointerException e){
//System.out.printf("NPE : %s\n",itemstack.toString());
@@ -129,13 +136,14 @@ public class ModIdentification {
}
}
public static String idFromStack(ItemStack itemstack){
try{
String modID = itemMap.get(itemstack.itemID);
return modID;
} catch (NullPointerException e){
//System.out.printf("NPE : %s\n",itemstack.toString());
return "";
}
}
/*
public static ModContainer findModContainer(String modID)
{
for(ModContainer mc : Loader.instance().getModList())
if(modID.equals(mc.getModId()))
return mc;
return null;
}
*/
}
-22
View File
@@ -1,22 +0,0 @@
package mcp.mobius.waila.tools;
import java.lang.reflect.Field;
public class Reflect {
public static Object getFieldValue(String className, String fieldname, Object obj){
try {
Class class_ = Class.forName(className);
Field field_ = class_.getField(fieldname);
field_.setAccessible(true);
Object object_ = field_.get(obj);
return object_;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
}