Compare commits

..
79 Commits
Author SHA1 Message Date
Thomas Guimbretiere 9b3cf62785 check for NEK and version bump. 2014-03-30 19:53:19 +02:00
Thomas Guimbretiere 0bb6caf334 Cleanup of TC module and addition of TT helmets handling. 2014-02-23 18:56:46 +01:00
Thomas Guimbretiere 5ac5f7956c Fixed Thaumcraft module. 2014-02-23 18:29:19 +01:00
Thomas Guimbretiere d00c17b3bb Fixed double registration of crops. 2014-02-23 17:34:36 +01:00
Thomas Guimbretiere 52ac40a10e Workaround for Morph eye height. 2014-02-23 17:29:09 +01:00
Thomas Guimbretiere 40facdda4b Added config option for Thaumcraft 2014-02-20 01:22:52 +01:00
Thomas Guimbretiere 3505888a82 Added new module section called "General".
Growth value and entity health are now config options there.
2014-02-20 00:34:09 +01:00
Thomas Guimbretiere 7eb35b7544 Max hp before text is now a config option 2014-02-20 00:24:22 +01:00
Thomas Guimbretiere 78039db017 Added support for Agriculture crop 2014-02-20 00:02:27 +01:00
Thomas Guimbretiere 17b5cbead9 Added tag Waila_1.5.0 for changeset ad46f8b41bbe 2014-02-19 23:44:28 +01:00
Thomas Guimbretiere d355ec28bb Added try/catch around NBT dumping client side. 2014-02-19 23:44:13 +01:00
Thomas Guimbretiere bd675cee28 Max hearts per line can be changed.
HP turns to text when max > 40
2014-02-19 23:21:42 +01:00
Thomas Guimbretiere 7c74db3640 Added lookup for known aspects. 2014-02-19 22:42:55 +01:00
Thomas Guimbretiere b65dc58fc6 Fixed tooltip size when name is bigger than tabbed display data. 2014-02-19 21:54:42 +01:00
Thomas Guimbretiere 1438d6a701 First fix for Entity hp display
Thaumcraft module will show aspects if the player is wearing googles of revealing.
2014-02-19 21:36:42 +01:00
Thomas Guimbretiere 223e2c7da6 Stopped bleeding gl constants at the end of rendering. 2014-02-19 18:52:27 +01:00
Thomas Guimbretiere 1aed35a2b5 Version bump
Local NBT is used if server sync is not available
Moved the "shift to see" handling to the tick handler directly
Fixed Steve's cart tank display
Both hide options for carpenter & secret rooms are not remote anymore.
2014-02-19 01:23:28 +01:00
Thomas Guimbretiere 96a0d27778 Added support for Statues. 2014-02-18 22:22:07 +01:00
Thomas Guimbretiere aecf8c0330 Moved the SpecialChars to the API
Deprecated the old IWailaBlock
2014-02-18 11:18:01 +01:00
Thomas Guimbretiere 4c1803accf Try at making a somewhat broken billboard code. 2014-02-18 10:46:59 +01:00
Thomas Guimbretiere 3ce45461eb Version bump 2014-02-18 02:43:42 +01:00
Thomas Guimbretiere 90dd086cc3 Added tag Waila_1.5.0_dev2 for changeset 1066f782daed 2014-02-18 02:43:32 +01:00
Thomas Guimbretiere fb9de99f39 Moved all the Vanilla module from ID to Block identification.
Fixed inheriting crop discovery
Added magical crops module.
2014-02-18 01:37:37 +01:00
Thomas Guimbretiere 1580296a2c Added Harvestcraft growth display 2014-02-18 01:04:20 +01:00
Thomas Guimbretiere 9d272f2e34 Fixed orientation of plates with alternate shapes. 2014-02-18 00:47:21 +01:00
Thomas Guimbretiere 2259e27f60 Ignore update 2014-02-17 22:44:13 +01:00
Thomas Guimbretiere 716498256b Added full FMP decorator support.
P:R decorator ported.
2014-02-17 22:41:00 +01:00
Thomas Guimbretiere bcd36dd638 Cleanup 2014-02-17 22:16:57 +01:00
Thomas Guimbretiere f790ac948d Replaced Project:Red old block registration with shiny new FMP registration.
Added DataAccessorFMP
2014-02-17 22:14:12 +01:00
Thomas Guimbretiere f282be75f4 FMPHandler registers itself properly when FMP is found. 2014-02-17 21:10:45 +01:00
Thomas Guimbretiere ec1ab8e548 Added registration for FMP data providers.
Moved getNBTInt to NBTUtil.
2014-02-17 20:36:02 +01:00
Thomas Guimbretiere add57cbd6b Spring cleaning on the registrar by abusing generics. 2014-02-17 20:09:28 +01:00
Thomas Guimbretiere ce249c806e Switched to generics for the registration. 2014-02-17 19:08:32 +01:00
Thomas Guimbretiere 3f6da9018c Tooltip cleanup works for entities too now. 2014-02-17 18:36:47 +01:00
Thomas Guimbretiere 2b7f3866a5 Separate config for blocks & entities 2014-02-17 18:32:50 +01:00
Thomas Guimbretiere b83d5bd297 Added shift toggled data display.
Will default to false, can be turned on in the config.
2014-02-17 18:02:45 +01:00
Thomas Guimbretiere 4e7e32fba7 Added config options for Steve's carts module.
Added toggle shift view.
2014-02-17 17:13:53 +01:00
Thomas Guimbretiere 2346ffd559 Steve's carts cargo and liquid managers done.
TODO : Add config options for EVERYTHING
2014-02-17 04:54:16 +01:00
Thomas Guimbretiere 49a2a32a77 Restricted synced keys for Carpenter's and SecretDoors. 2014-02-17 02:07:44 +01:00
Thomas Guimbretiere 47fb4c55a8 Carpenter's block module added 2014-02-17 02:05:08 +01:00
Thomas Guimbretiere b6b5404440 Added torches and trapdoors to the override. 2014-02-17 01:29:37 +01:00
Thomas Guimbretiere 89fc1c8ce7 Added secret room module.
Added lookup by TileEntity for override stack to the Raytracing routine.
2014-02-17 00:40:46 +01:00
Thomas Guimbretiere 79107209d9 Added option in the VanillaMC module to hide/show silverfishes.
It will default to true (Hide silverfishes).
2014-02-17 00:10:01 +01:00
Thomas Guimbretiere 3533ea2d23 Added comments to the accessors. 2014-02-16 23:45:24 +01:00
Thomas Guimbretiere f1a4056431 Try/Catch the creation of the stack in the Accessor (it does fail sometimes with some mods.) 2014-02-16 23:35:32 +01:00
Thomas Guimbretiere dcc35737be Added liquid display to Steve's carts.
Added getStack to the accessor to get the none overriden stack.
ID:Meta is now based on the override stack instead of the accessor.
Fixed a NPE when a stack provider returns a null stack.
Version bump.
2014-02-16 23:33:53 +01:00
Thomas Guimbretiere 4a3015eb21 Steve's carts first module test. 2014-02-15 21:13:27 +01:00
Thomas Guimbretiere d3a317e3dd All modules are now registering a full NBT sync request (just because it would be a pita to track down the keys). 2014-02-15 17:16:19 +01:00
Thomas Guimbretiere 9d1045333a Entity data is now synced too. 2014-02-15 17:01:14 +01:00
Thomas Guimbretiere 80e30abec3 Added partial NBT syncing to the protocol.
TEs will NOT be synced by default anymore. You actually have to either request "*" to get the whole NBT,
or request specific keys using "aaa.bbb", etc.
2014-02-15 16:41:38 +01:00
Thomas Guimbretiere 2dd88b9c13 Added synced NBT Key registration and retrieval. 2014-02-15 12:24:04 +01:00
Thomas Guimbretiere f46d9393b5 Refactoring & Cleanup 2014-02-15 11:43:12 +01:00
Thomas Guimbretiere d2f8911797 Right justification.
Fixed tooltip size prb.
2014-02-15 03:13:21 +01:00
Thomas Guimbretiere a1365b2db3 Tabulated display of IC2 tooltips. 2014-02-15 02:24:34 +01:00
Thomas Guimbretiere 0988ee744e Added Empty Heart to the icon list.
Fixed light prb (tesselator color reset)
Added life display to EntityLivingBase
2014-02-15 02:07:01 +01:00
Thomas Guimbretiere 537c3dc1af Icon rendering and handling is almost done. 2014-02-15 01:35:49 +01:00
Thomas Guimbretiere 5f7bf6cc5c Generic icon rendering method based on an enum with u,v,su,sv
Also handles adding a backgroup icon (for hearts for example).
2014-02-15 00:18:59 +01:00
Thomas Guimbretiere 904fe472b8 Code cleanup, basic icon rendering support. 2014-02-15 00:07:14 +01:00
Thomas Guimbretiere 0ef5f65067 Support for columns is now added. Inserting SpecialChars.TAB in a tooltip will create a new column.
Text in the columns is aligned properly when rendering.
2014-02-14 22:36:11 +01:00
Thomas Guimbretiere b6d529575d Basic line splitting
This will be redone and put here as reference.
2014-02-14 22:04:12 +01:00
Thomas Guimbretiere 669435f153 Moved string rendering to the Tooltip itself to allow for more complex stuff. 2014-02-14 18:42:54 +01:00
Thomas Guimbretiere f1c484d390 Moved more data to the Tooltip class for precomputation.
Only one overlay renderer now with offsets and data precomputed in the ClientTick (not more Entity vs Stack).
2014-02-14 18:32:32 +01:00
Thomas Guimbretiere ef20dcc4c6 Tooltip position & size computation moved out of the RenderTick into the ClientTick.
Will allow for more flexibility on how to render it too since more can be computed there.
2014-02-14 17:55:48 +01:00
Thomas Guimbretiere 1bbf3e8747 Server => Client config key syncing is operational. 2014-02-13 19:50:11 +01:00
Thomas Guimbretiere 3bc29dd907 Key forcing is now send over the network upon login. 2014-02-13 19:29:22 +01:00
Thomas Guimbretiere 23bbd2ceb4 Moved Overlay data to a separate class (OverlayConfig)
Moved default config file to ConfigHandler.
2014-02-13 19:00:37 +01:00
Thomas Guimbretiere d0e2932257 Server forcing config keys are generated.
The whole file is now loaded only once on startup.
2014-02-13 18:51:40 +01:00
Thomas Guimbretiere cf6ecd55e5 First pass at reworking the config system to handle multiple categories (General and modules for now) 2014-02-13 18:34:53 +01:00
Thomas Guimbretiere bfc2e5dec6 Declared Waila API as an API so it doesn't get messed up by other mods.
Fixes issue #22
2014-02-13 00:10:51 +01:00
Thomas Guimbretiere d6589ec1c1 Config options are added to the config file when the option is registered. 2014-02-12 23:51:01 +01:00
Thomas Guimbretiere 1cadab1320 Clean up
Added commented HP display for demonstration.
2014-02-12 22:57:21 +01:00
Thomas Guimbretiere 91aea326c7 Override for entities is in. 2014-02-12 22:27:10 +01:00
Thomas Guimbretiere d2c6d95e75 Entity tooltip is now handled by the API (registration, lookup, etc).
TODO : Add icon handling and overriding.
2014-02-12 22:12:32 +01:00
Thomas Guimbretiere 5a8673d322 Added & registered default empty module for Entities. 2014-02-12 18:57:59 +01:00
Thomas Guimbretiere 917eaab8be Added tag 1.4.5a for changeset 5dd753fa7c80 2014-02-12 18:20:19 +01:00
Thomas Guimbretiere 198d0c7079 Removed some logging
Reflection is now done with FML utilities
Fixes issue #17
Version bump
2014-02-12 18:20:11 +01:00
Thomas Guimbretiere 03f4bed4fe Added missing registrar methods for entities. 2014-02-11 21:10:46 +01:00
Thomas Guimbretiere 1bfcc07e1f Fixed getSide()
Fix for issue #21
2014-02-11 20:38:33 +01:00
Thomas Guimbretiere ef9a1bedfc Basic IWailaEntityProvider registration process implemented.
Removed duplicated stackProviders & decoratorProviders methods based on IDs
Deprecated ID based registration (in plan for 1.7)
2014-02-11 20:09:12 +01:00
133 changed files with 4276 additions and 1951 deletions

No files matched your search

+12 -1
View File
@@ -18,6 +18,8 @@ choice.showhidewaila=Show/Hide Waila
choice.showhideidmeta=Show ID:Metadata
choice.toggledmaintained=Toggled/Maintained
choice.showliquids=Liquids
choice.shifttoggledblock=Sneak toggle blocks
choice.shifttoggledents=Sneak toggle entities
screen.button.configureaspect=Configure aspect...
enchant.title.name=Name
@@ -122,6 +124,7 @@ option.vanilla.repeater=Repeater delay
option.vanilla.comparator=Comparator mode
option.vanilla.redstone=Redstone power
option.vanilla.jukebox=Jukebox disk
option.vanilla.silverfish=Hide silverfish
option.etb.displaydata=Show socket data
option.enderio.inout=Show input/output
option.enderio.storage=Show stored MJ
@@ -134,4 +137,12 @@ option.pr.showio=Show gates IO
option.pr.showdata=Show gates data
option.extrautilities.fluidamount=Show fluid amount
option.openblocks.fluidamount=Show fluid amount
option.railcraft.fluidamount=Show fluid amount
option.railcraft.fluidamount=Show fluid amount
option.secretrooms.hide=Hide camo blocks
option.carpenters.hide=Hide camo blocks
option.stevescarts.showall=Show data
option.stevescarts.colorblind=Colorblind mode
option.stevescarts.shifttoggle=Shift toggle
option.general.showhp=Show entities health
option.general.showcrop=Show crop growth
option.thaumcraft.aspects=Show aspects
-3
View File
@@ -1,3 +0,0 @@
#gource --file-idle-time 0 --camera-mode overview --title "Minecraft Coder Pack" -s 2 --hide-filenames --stop-at-end --disable-progress --output-ppm-stream - | ffmpeg -y -r 60 -b 6000K -f image2pipe -vcodec ppm -i - -vcodec libtheora out.ogg
gource --file-idle-time 0 --camera-mode overview --title "Waila" -s 2 --hide-filenames --stop-at-end --disable-progress --output-ppm-stream - | ffmpeg -y -f image2pipe -vcodec ppm -i - -vpre libx264-medium -vcodec libx264 out_small.mkv
+21 -74
View File
@@ -10,18 +10,20 @@ 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.ModuleRegistrar;
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.network.WailaConnectionHandler;
import mcp.mobius.waila.network.WailaPacketHandler;
import mcp.mobius.waila.overlay.OverlayConfig;
import mcp.mobius.waila.overlay.DecoratorRenderer;
import mcp.mobius.waila.server.ProxyServer;
import mcp.mobius.waila.tools.ModIdentification;
import mcp.mobius.waila.utils.Constants;
import mcp.mobius.waila.utils.ModIdentification;
import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.src.ModLoader;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.oredict.OreDictionary;
import codechicken.lib.lang.LangUtil;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLModContainer;
import cpw.mods.fml.common.Mod;
@@ -34,12 +36,13 @@ 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.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.common.network.NetworkMod;
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")
@Mod(modid="Waila", name="Waila", version="1.4.5_1.7.2")
@Mod(modid="Waila", name="Waila", version="1.5.2", dependencies="required-after:NotEnoughItems")
@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class,
packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)")
//packetHandler = WailaPacketHandler.class)
public class Waila {
// The instance of your mod that Forge uses.
@@ -48,50 +51,15 @@ public class Waila {
@SidedProxy(clientSide="mcp.mobius.waila.client.ProxyClient", serverSide="mcp.mobius.waila.server.ProxyServer")
public static ProxyServer proxy;
public static Logger log = Logger.getLogger("Waila");
public Configuration config = null;
public boolean serverPresent = false;
public static int posX;
public static int posY;
public static int alpha;
public static int bgcolor;
public static int gradient1;
public static int gradient2;
public static int fontcolor;
public static float scale;
//public SimpleNetworkWrapper network = new SimpleNetworkWrapper("Waila");
/* INIT SEQUENCE */
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
config = new Configuration(event.getSuggestedConfigurationFile());
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, true);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, false);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, false);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true);
posX = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 5000).getInt();
posY = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 100).getInt();
alpha = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, 80).getInt();
bgcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR, 0x100010).getInt();
gradient1 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1, 0x5000ff).getInt();
gradient2 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2, 0x28007f).getInt();
fontcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR, 0xA0A0A0).getInt();
scale = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE, 100).getInt() / 100.0f;
config.save();
updateColors();
ConfigHandler.instance().loadDefaultConfig(event);
OverlayConfig.updateColors();
MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
}
@EventHandler
@@ -102,16 +70,6 @@ public class 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
@@ -119,13 +77,12 @@ public class Waila {
proxy.registerHandlers();
ModIdentification.init();
/*
if (ConfigHandler.instance().getConfig(Constants.CFG_WAILA_KEYBIND)){
if (!ModLoader.isModLoaded("nek") && ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){
for (String key: ModIdentification.keyhandlerStrings.keySet()){
//String orig = I18n.getString(key);
//if (orig.equals(key))
String orig = LanguageRegistry.instance().getStringLocalization(key);
String orig = I18n.getString(key);
if (orig.equals(key))
orig = LanguageRegistry.instance().getStringLocalization(key);
if (orig.equals(key))
orig = LangUtil.translateG(key);
if (orig.isEmpty())
@@ -152,7 +109,6 @@ public class Waila {
LanguageRegistry.instance().addStringLocalization(key, modif);
}
}
*/
}
@@ -213,13 +169,4 @@ public class Waila {
}
}
public static void updateColors(){
alpha = (int)(ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_ALPHA) / 100.0f * 256) << 24;
bgcolor = alpha + ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_BGCOLOR);
gradient1 = alpha + ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_GRADIENT1);
gradient2 = alpha + ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_GRADIENT2);
fontcolor = alpha + ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_FONTCOLOR);
}
}
@@ -0,0 +1,30 @@
package mcp.mobius.waila.addons.agriculture;
import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class AgricultureModule {
public static Class BlockCrop = null;
public static void register(){
try{
Class Agriculture = Class.forName("com.teammetallurgy.agriculture.Agriculture");
Waila.log.log(Level.INFO, "Agriculture mod found.");
} catch (ClassNotFoundException e){
Waila.log.log(Level.INFO, "[Agriculture] Agriculture mod not found.");
return;
}
try{
BlockCrop = Class.forName("com.teammetallurgy.agriculture.crops.BlockCrop");
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARNING, "[Agriculture] Class not found. " + e);
return;
}
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCrop(), BlockCrop);
}
}
@@ -1,30 +1,42 @@
package mcp.mobius.waila.addons.thaumcraft;
package mcp.mobius.waila.addons.agriculture;
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;
public class HUDHandlerPlants implements IWailaDataProvider {
public class HUDHandlerCrop implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata());
return null;
}
@Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
return currenttip;
}
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
if (!config.getConfig("general.showcrop")) return currenttip;
int growthStage = accessor.getMetadata();
float growthValue = (growthStage / 6.0F) * 100.0F;
if (growthValue < 100.0)
currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
else
currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
}
@@ -4,7 +4,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import net.minecraftforge.common.util.ForgeDirection;
import codechicken.lib.lang.LangUtil;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -37,6 +38,7 @@ public class AppEngModule {
Waila.log.log(Level.INFO, "AppEng mod found.");
ModuleRegistrar.instance().addConfig("Applied Energetic", "appeng.monitorcontent");
ModuleRegistrar.instance().registerBodyProvider(new HUDAppEngMonitor(), TileStorageMonitor);
ModuleRegistrar.instance().registerBodyProvider(new HUDAppEngMonitor(), TileStorageMonitor);
ModuleRegistrar.instance().registerSyncedNBTKey("*", 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 {
@@ -0,0 +1,41 @@
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.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){
Waila.log.log(Level.WARNING, "[BB] BetterBarrel classes not found.");
} catch (NoSuchFieldException e){
Waila.log.log(Level.WARNING, "[BB] Storage field not found.");
} catch (NoSuchMethodException e){
Waila.log.log(Level.WARNING, "[BB] getItem() not found.");
}
if (IBarrelStorage_getItem != null){
Waila.log.log(Level.INFO, "Waila module BetterBarrel succefully hooked.");
ModuleRegistrar.instance().addConfig("BetterBarrels", "bb.content");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBBContent(), TileEntityBarrel);
}
}
}
@@ -0,0 +1,64 @@
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.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){
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;
}
}
@@ -5,7 +5,7 @@ import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
public class BCModule {
@@ -42,6 +42,7 @@ public class BCModule {
ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype");
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTank);
}
}
@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -72,7 +72,8 @@ public class BCPowerAPIModule {
ModuleRegistrar.instance().addConfigRemote("BuildcraftAPI", "bcapi.storage");
ModuleRegistrar.instance().addConfig("BuildcraftAPI", "bcapi.consump");
ModuleRegistrar.instance().addConfig("BuildcraftAPI", "bcapi.trigger");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIPowerReceptor(), IPowerReceptor);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIPowerReceptor(), IPowerReceptor);
ModuleRegistrar.instance().registerSyncedNBTKey("*", IPowerReceptor);
}
@@ -3,21 +3,27 @@ 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.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.util.ForgeDirection;
import net.minecraftforge.common.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 {
@@ -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.util.ForgeDirection;
import mcp.mobius.waila.WailaExceptionHandler;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.cbcore.LangUtil;
import mcp.mobius.waila.utils.WailaExceptionHandler;
public class HUDHandlerIPowerReceptor implements IWailaDataProvider {
@@ -0,0 +1,43 @@
package mcp.mobius.waila.addons.carpenters;
import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class CarpentersModule {
public static Class TEBase = null;
public static Class BlockCarpentersDoor = null;
public static Class BlockCarpentersHatch = null;
public static void register(){
try{
Class CarpentersBlocks = Class.forName("carpentersblocks.CarpentersBlocks");
Waila.log.log(Level.INFO, "CarpentersBlocks mod found.");
} catch (ClassNotFoundException e){
Waila.log.log(Level.INFO, "[CarpentersBlocks] CarpentersBlocks mod not found.");
return;
}
try{
TEBase = Class.forName("carpentersblocks.tileentity.TEBase");
BlockCarpentersDoor = Class.forName("carpentersblocks.block.BlockCarpentersDoor");
BlockCarpentersHatch = Class.forName("carpentersblocks.block.BlockCarpentersHatch");
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARNING, "[CarpentersBlocks] Class not found. " + e);
return;
} catch (Exception e) {
Waila.log.log(Level.WARNING, "[CarpentersBlocks] Error while loading module. " + e);
return;
}
ModuleRegistrar.instance().addConfig("Carpenter's Blocks", "carpenters.hide");
ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersDoor);
ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersHatch);
ModuleRegistrar.instance().registerSyncedNBTKey("data", TEBase);
ModuleRegistrar.instance().registerSyncedNBTKey("cover_6", TEBase);
}
}
@@ -0,0 +1,56 @@
package mcp.mobius.waila.addons.carpenters;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
public class HUDCarpentersBlocksTE implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
if (!config.getConfig("carpenters.hide")) return null;
NBTTagCompound tag = accessor.getNBTData();
short data = tag.getShort("data");
short cover = tag.getShort("cover_6");
if(CarpentersModule.BlockCarpentersDoor.isInstance(accessor.getBlock())){
int type = data & 0x7;
if (type != 5) return null;
if (cover == 0) return null;
return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12);
}
else if (CarpentersModule.BlockCarpentersHatch.isInstance(accessor.getBlock())){
int type = data & 0x7;
if (type != 0) return null;
if (cover == 0) return null;
return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12);
}
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) {
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -59,6 +59,8 @@ public class EnderIOModule {
ModuleRegistrar.instance().addConfig("EnderIO", "enderio.channel");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCapacitorBank);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileCapacitorBank);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);
}
}
@@ -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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
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 {
@@ -52,5 +52,6 @@ public class EnderStorageModule {
ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(), TileFrequencyOwner);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileFrequencyOwner);
}
}
@@ -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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
public class HUDHandlerStorage implements IWailaDataProvider {
+1 -1
View File
@@ -78,6 +78,6 @@ public class ETBModule {
ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileSocket);
}
}
@@ -5,11 +5,11 @@ import java.util.List;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.WailaExceptionHandler;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.utils.WailaExceptionHandler;
public class HUDHandlerSocket implements IWailaDataProvider {
@@ -29,6 +29,7 @@ public class ExtraUtilitiesModule {
}
ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(), TileEntityDrum);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(), TileEntityDrum);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityDrum);
}
}
@@ -4,7 +4,7 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -26,7 +26,8 @@ public class GravestoneModule {
}
ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone);
ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone);
ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockGraveStone);
}
}
@@ -1,14 +1,15 @@
package mcp.mobius.waila.addons.thaumcraft;
package mcp.mobius.waila.addons.harvestcraft;
import java.util.List;
import mcp.mobius.waila.WailaExceptionHandler;
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 net.minecraft.item.ItemStack;
import mcp.mobius.waila.utils.NBTUtil;
public class HUDHandlerCapacitor implements IWailaDataProvider {
public class HUDHandlerPamCrop implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
@@ -22,22 +23,22 @@ public class HUDHandlerCapacitor implements IWailaDataProvider {
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
if (config.getConfig("thaumcraft.storedvis")){
try{
short storedVis = ThaumcraftModule.TileCrystalCapacitor_StoredVis.getShort(accessor.getTileEntity());
short maxVis = ThaumcraftModule.TileCrystalCapacitor_MaxVis.getShort(accessor.getTileEntity());
if (!config.getConfig("general.showcrop")) return currenttip;
currenttip.add(String.format("%s/%s vis", storedVis, maxVis));
}catch (Exception e){
currenttip = WailaExceptionHandler.handleErr(e, accessor.getClass().getName(), currenttip);
}
}
int growthStage = NBTUtil.getNBTInteger(accessor.getNBTData(), "growthStage");
float growthValue = (growthStage / 2.0F) * 100.0F;
if (growthValue < 100.0)
currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
else
currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
}
@@ -0,0 +1,30 @@
package mcp.mobius.waila.addons.harvestcraft;
import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class HarvestcraftModule {
public static Class TileEntityPamCrop = null;
public static void register(){
try{
Class PamHarvestCraft = Class.forName("assets.pamharvestcraft.PamHarvestCraft");
Waila.log.log(Level.INFO, "PamHarvestCraft mod found.");
} catch (ClassNotFoundException e){
Waila.log.log(Level.INFO, "[PamHarvestCraft] PamHarvestCraft mod not found.");
return;
}
try{
TileEntityPamCrop = Class.forName("assets.pamharvestcraft.TileEntityPamCrop");
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARNING, "[PamHarvestCraft] Class not found. " + e);
return;
}
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerPamCrop(), TileEntityPamCrop);
}
}
@@ -2,13 +2,14 @@ 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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDHandlerTEBaseGenerator implements IWailaDataProvider {
@@ -50,7 +51,7 @@ public class HUDHandlerTEBaseGenerator implements IWailaDataProvider {
double stored = IC2Module.getStoredEnergy(accessor);
if ( stored >= 0.0 && storage > 0)
currenttip.add(String.format("%s : \u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, Math.round(Math.min(stored,storage)), storage));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage));
//else if (stored >= 0.0)
// currenttip.add(String.format("Stored : %d EU", stored));
@@ -58,7 +59,7 @@ public class HUDHandlerTEBaseGenerator implements IWailaDataProvider {
if (ConfigHandler.instance().getConfig("ic2.outputeu")){
if ( production > 0)
currenttip.add(String.format("%s : \u00a7f%d\u00a7r EU/t", outputStr, production));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
}
} catch (Exception e){
@@ -2,19 +2,21 @@ 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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDHandlerTEElectricBlock implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor,
IWailaConfigHandler config) {
// TODO Auto-generated method stub
return null;
}
@@ -36,13 +38,13 @@ public class HUDHandlerTEElectricBlock implements IWailaDataProvider {
int storage = IC2Module.TEEB_MaxStorage.getInt(accessor.getTileEntity());
if ( stored >= 0.0 )
currenttip.add(String.format("%s : \u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, Math.round(Math.min(stored,storage)), storage));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage));
}
if (ConfigHandler.instance().getConfig("ic2.outputeu")){
int production = IC2Module.TEEB_Output.getInt(accessor.getTileEntity());
if ( production > 0)
currenttip.add(String.format("%s : \u00a7f%d\u00a7r EU/t", outputStr, production));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
}
} catch (Exception e){
@@ -2,18 +2,21 @@ 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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDHandlerTEStandardMachine implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
public ItemStack getWailaStack(IWailaDataAccessor accessor,
IWailaConfigHandler config) {
// TODO Auto-generated method stub
return null;
}
@@ -51,17 +54,17 @@ public class HUDHandlerTEStandardMachine implements IWailaDataProvider {
/* EU Storage */
if (ConfigHandler.instance().getConfig("ic2.storage")){
if ( stored >= 0.0 )
currenttip.add(String.format("%s : \u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, Math.round(Math.min(stored,storage)), storage));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage));
}
if (ConfigHandler.instance().getConfig("ic2.consump")){
if ( consumption > 0)
currenttip.add(String.format("%s : \u00a7f%d\u00a7r EU/t", powerStr, consumption ));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", powerStr, TAB + ALIGNRIGHT, consumption ));
}
if (ConfigHandler.instance().getConfig("ic2.inputeu")){
if ( maxinput > 0)
currenttip.add(String.format("%s : \u00a7f%d\u00a7r EU/t", maxPowerStr, maxinput ));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", maxPowerStr, TAB + ALIGNRIGHT, maxinput ));
}
} catch (Exception e){
@@ -2,6 +2,7 @@ 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;
@@ -9,12 +10,10 @@ 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 static mcp.mobius.waila.api.SpecialChars.*;
public class HUDHandlerTETradeOMat implements IWailaDataProvider {
//TODO : Well, redo the damn class, that's it.
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
@@ -27,7 +26,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");
@@ -40,15 +39,15 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
if (offer.tagCount() == 1){
NBTTagCompound subtag = (NBTTagCompound)offer.tagAt(0);
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", offersStr, is.stackSize, is.getDisplayName()));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r x \u00a7f%s\u00a7r", offersStr, TAB + ALIGNRIGHT, is.stackSize, is.getDisplayName()));
}
if (demand.tagCount() == 1){
NBTTagCompound subtag = (NBTTagCompound)demand.tagAt(0);
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()));
currenttip.add(String.format("%s%s\u00a7f%d\u00a7r x \u00a7f%s\u00a7r", demandsStr, TAB + ALIGNRIGHT, is.stackSize, is.getDisplayName()));
}
*/
return currenttip;
}
+12 -7
View File
@@ -5,6 +5,7 @@ import java.lang.reflect.Method;
import java.util.List;
import java.util.logging.Level;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
@@ -12,12 +13,10 @@ 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;
import mcp.mobius.waila.tools.AccessHelper;
import mcp.mobius.waila.utils.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;
@@ -126,7 +125,14 @@ public class IC2Module {
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntitySemifluidGenerator);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntityGeoGenerator);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEElectricBlock(), TileEntityElectricBlock);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTETradeOMat(), TileEntityTradeOMat);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTETradeOMat(), TileEntityTradeOMat);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStandardMachine);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityBaseGenerator);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntitySemifluidGenerator);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityGeoGenerator);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityElectricBlock);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTradeOMat);
}
/* Retuns the current stored energy if available in the nbt and config is true */
@@ -145,7 +151,6 @@ public class IC2Module {
NBTTagCompound nbt = accessor.getNBTData();
IC2Upgrades upgrades = new IC2Upgrades();
/*
if (!nbt.hasKey("InvSlots")) return null;
NBTTagCompound inventory = nbt.getCompoundTag("InvSlots");
@@ -153,7 +158,8 @@ public class IC2Module {
NBTTagList nbtupgrades = inventory.getCompoundTag("upgrade").getTagList("Contents");
List tagList = (List)AccessHelper.getField("net.minecraft.nbt.NBTTagList", "tagList", nbtupgrades);
//List tagList = (List)AccessHelper.getField("net.minecraft.nbt.NBTTagList", "tagList", nbtupgrades);
List tagList = ObfuscationReflectionHelper.getPrivateValue(NBTTagList.class, nbtupgrades, "field_74747_a");
for (Object subobj : tagList){
NBTTagCompound subtag = (NBTTagCompound)subobj;
@@ -169,7 +175,6 @@ public class IC2Module {
if (OverclockerUpgradeStack.getItemDamage() == meta && OverclockerUpgradeStack.itemID == id)
upgrades.overclocker += count;
}
*/
return upgrades;
}
@@ -1,17 +1,18 @@
package mcp.mobius.waila.addons.thaumcraft;
package mcp.mobius.waila.addons.magicalcrops;
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;
public class HUDHandlerLeaves implements IWailaDataProvider {
public class HUDHandlerMagicalCrops implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata());
return null;
}
@Override
@@ -21,11 +22,21 @@ public class HUDHandlerLeaves implements IWailaDataProvider {
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
if (!config.getConfig("general.showcrop")) return currenttip;
int growthStage = accessor.getMetadata();
float growthValue = (growthStage / 7.0F) * 100.0F;
if (growthValue < 100.0)
currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
else
currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
}
@@ -0,0 +1,30 @@
package mcp.mobius.waila.addons.magicalcrops;
import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class MagicalCropsModule {
public static Class BlockMagicalCrops = null;
public static void register(){
try{
Class MagicalCrops = Class.forName("magicalcrops.mod_sCrops");
Waila.log.log(Level.INFO, "MagicalCrops mod found.");
} catch (ClassNotFoundException e){
Waila.log.log(Level.INFO, "[MagicalCrops] MagicalCrops mod not found.");
return;
}
try{
BlockMagicalCrops = Class.forName("magicalcrops.BlockMagicalCrops");
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARNING, "[MagicalCrops] Class not found. " + e);
return;
}
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerMagicalCrops(), BlockMagicalCrops);
}
}
@@ -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.util.ForgeDirection;
import net.minecraftforge.common.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 {
@@ -29,5 +29,6 @@ public class OpenBlocksModule {
ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank);
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTank);
}
}
@@ -4,13 +4,16 @@ 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.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.api.IWailaBlockDecorator;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaFMPAccessor;
import mcp.mobius.waila.api.IWailaFMPDecorator;
import mcp.mobius.waila.gui.helpers.UIHelper;
import mcp.mobius.waila.utils.NBTUtil;
public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
public class HUDDecoratorRsGateLogic implements IWailaFMPDecorator {
static byte[][] IOARRAY={
{1,1,2,1} /* OR */, {1,1,2,1} /* NOR */, {1,2,2,2} /* NOT */, {1,1,2,1} /* AND */,
@@ -22,37 +25,28 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
{11,12,11,12} /* Inver */, {11,12,11,12} /* Buff */, {1,9,2,8} /* Cmp */, {1,12,2,12} /* And */,
};
static byte[][] IOARRAYALTER={
{1,8,2,9} /* Cmp 1*/, {1,6,2,2} /* State 1*/, {2,8,2,9} /* Count 1*/, {6,2,2,1} /* Transp 1*/,
{2,1,2,1} /* Latch 1*/, {2,1,2,1} /* Latch 2*/, {2,1,2,1} /* Latch 3*/
};
static String[] IONAMES={ "", "IN", "OUT", "SWAP", "IN_A", "IN_B", "LOCK", "IO", "POS", "NEG", "BUS", "A", "B"};
@Override
public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) {
/*
public void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config) {
if (!config.getConfig("pr.showio")) return;
int orient = 0;
int subID = 0;
int shape = 0;
boolean found = false;
if (!accessor.getNBTData().hasKey("parts")) return;
NBTTagList parts = accessor.getNBTData().getTagList("parts");
for (int i = 0; i < parts.tagCount(); i++){
NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i);
String id = subtag.getString("id");
if (id.equals("pr_sgate") || id.equals("pr_igate") ||
id.equals("pr_tgate") || id.equals("pr_bgate") ||
id.equals("pr_agate") || id.equals("pr_rgate")){
orient = accessor.getNBTInteger(subtag, "orient");
subID = accessor.getNBTInteger(subtag, "subID");
shape = accessor.getNBTInteger(subtag, "shape");
found = true;
}
}
orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient");
subID = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID");
shape = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape");
if (!found) return;
//orient = orient - ((orient & 0x10) + (orient & 0x8) + (orient & 0x4));
int hOrient = orient & 0x3;
ForgeDirection vOrient = ForgeDirection.getOrientation((orient - (orient & 0x3)) >> 2);
@@ -69,8 +63,27 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
hOrient = 3;
String[] IOStr = new String[4];
for (int i = 0; i < 4; i++)
IOStr[i] = IONAMES[IOARRAY[subID][i]];
if (shape != 0){
int altIndex = -1;
if (subID == 26 && shape == 1) altIndex = 0;
if (subID == 20 && shape == 1) altIndex = 1;
if (subID == 19 && shape == 1) altIndex = 2;
if (subID == 14 && shape == 1) altIndex = 3;
if (subID == 12 && shape == 1) altIndex = 4;
if (subID == 12 && shape == 2) altIndex = 5;
if (subID == 12 && shape == 3) altIndex = 6;
if (altIndex == -1)
for (int i = 0; i < 4; i++)
IOStr[i] = IONAMES[IOARRAY[subID][i]];
else
for (int i = 0; i < 4; i++)
IOStr[i] = IONAMES[IOARRAYALTER[altIndex][i]];
} else {
for (int i = 0; i < 4; i++)
IOStr[i] = IONAMES[IOARRAY[subID][i]];
}
String[] IOStrRot = new String[4];
@@ -119,7 +132,6 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
break;
default:
break;
}
double x = accessor.getRenderingPosition().xCoord;
@@ -198,7 +210,6 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
break;
}
*/
}
}
@@ -0,0 +1,82 @@
package mcp.mobius.waila.addons.projectred;
import java.util.List;
import net.minecraft.item.ItemStack;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaFMPAccessor;
import mcp.mobius.waila.api.IWailaFMPProvider;
import mcp.mobius.waila.utils.NBTUtil;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDFMPGateLogic implements IWailaFMPProvider {
@Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config) {
if (!config.getConfig("pr.showdata")) return currenttip;
int orient = 0;
int subID = 0;
int shape = 0;
int pmax = 0;
int val = 0;
int max = 0;
int dec = 0;
int inc = 0;
orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient");
subID = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID");
shape = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape");
if (subID == 17)
pmax = NBTUtil.getNBTInteger(accessor.getNBTData(), "pmax");
if (subID == 19){
val = NBTUtil.getNBTInteger(accessor.getNBTData(), "val");
max = NBTUtil.getNBTInteger(accessor.getNBTData(), "max");
dec = NBTUtil.getNBTInteger(accessor.getNBTData(), "dec");
inc = NBTUtil.getNBTInteger(accessor.getNBTData(), "inc");
}
switch(subID){
case 10:
currenttip.add(String.format("[Repeater]" + TAB + ALIGNRIGHT + WHITE + "%d" + GRAY + " ticks", (int)Math.pow(2, shape)));
break;
case 15:
if (shape == 0)
currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Open");
if (shape == 1)
currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Half closed");
if (shape == 2)
currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Closed");
break;
case 17:
currenttip.add(String.format("[Timer delay]" + TAB + ALIGNRIGHT + WHITE + "%d " + GRAY + "ms", (pmax + 2) * 50));
break;
case 19:
currenttip.add(String.format("[Counter value]"+ TAB + ALIGNRIGHT + WHITE + "%d " + GRAY + "/ " + WHITE + "%d", val, max));
currenttip.add(String.format("[Counter step]" + TAB + ALIGNRIGHT + WHITE + "-%d " + GRAY + "/ " + WHITE + "+%d", dec, inc));
default:
break;
}
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
@@ -1,106 +0,0 @@
package mcp.mobius.waila.addons.projectred;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
public class HUDHandlerRsGateLogic 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) {
/*
if (!config.getConfig("pr.showdata")) return currenttip;
int orient = 0;
int subID = 0;
int shape = 0;
int pmax = 0;
int val = 0;
int max = 0;
int dec = 0;
int inc = 0;
boolean found = false;
if (!accessor.getNBTData().hasKey("parts")) return currenttip;
NBTTagList parts = accessor.getNBTData().getTagList("parts");
for (int i = 0; i < parts.tagCount(); i++){
NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i);
String id = subtag.getString("id");
if (id.equals("pr_sgate") || id.equals("pr_igate") ||
id.equals("pr_tgate") || id.equals("pr_bgate") ||
id.equals("pr_agate") || id.equals("pr_rgate")){
orient = accessor.getNBTInteger(subtag, "orient");
subID = accessor.getNBTInteger(subtag, "subID");
shape = accessor.getNBTInteger(subtag, "shape");
if (subID == 17)
pmax = accessor.getNBTInteger(subtag, "pmax");
if (subID == 19){
val = accessor.getNBTInteger(subtag, "val");
max = accessor.getNBTInteger(subtag, "max");
dec = accessor.getNBTInteger(subtag, "dec");
inc = accessor.getNBTInteger(subtag, "inc");
}
found = true;
}
}
if (!found) return currenttip;
switch(subID){
case 10:
currenttip.add(String.format("Delay : \u00a7f%d ticks", (int)Math.pow(2, shape)));
break;
case 15:
if (shape == 0)
currenttip.add("Shape : \u00a7fOpen");
if (shape == 1)
currenttip.add("Shape : \u00a7fHalf closed");
if (shape == 2)
currenttip.add("Shape : \u00a7fclosed");
break;
case 17:
currenttip.add(String.format("Timer : \u00a7f%d \u00a7rms", (pmax + 2) * 50));
break;
case 19:
currenttip.add(String.format("Value : \u00a7f%d \u00a7r/ \u00a7f%d", val, max));
currenttip.add(String.format("Step : \u00a7f-%d \u00a7r/ \u00a7f+%d", dec, inc));
default:
break;
}
*/
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
@@ -4,14 +4,12 @@ import java.io.File;
import java.util.logging.Level;
import net.minecraft.block.Block;
import net.minecraftforge.common.Configuration;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ProjectRedModule {
public static Class BlockMultipart = null;
public static void register(){
try{
Class ModClass = Class.forName("mrtjp.projectred.ProjectRedIntegration");
@@ -21,30 +19,26 @@ public class ProjectRedModule {
return;
}
try{
//InstancedRsGateLogic = Class.forName("mrtjp.projectred.integration.InstancedRsGateLogic");
BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart");
} catch (ClassNotFoundException 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);
// return;
// } catch (NoSuchFieldException e){
// mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
// return;
} catch (Exception e){
Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
return;
}
ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showio");
ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showdata");
ModuleRegistrar.instance().registerBlockDecorator(new HUDDecoratorRsGateLogic(), BlockMultipart);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerRsGateLogic(), BlockMultipart);
ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_sgate");
ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_igate");
ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_tgate");
ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_bgate");
ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_agate");
ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_rgate");
ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_sgate");
ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_igate");
ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_tgate");
ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_bgate");
ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_agate");
ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_rgate");
//ModuleRegistrar.instance().registerBlockDecorator(new HUDDecoratorRsGateLogic(), BlockMultipart);
//ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerRsGateLogic(), BlockMultipart);
//ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart);
}
}
@@ -3,14 +3,14 @@ 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;
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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
public class HUDHandlerTank implements IWailaDataProvider {
@@ -38,5 +38,6 @@ public class RailcraftModule {
ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTankBase);
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTankBase);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTankBase);
}
}
@@ -0,0 +1,88 @@
package mcp.mobius.waila.addons.secretrooms;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
public class HUDTileEntityCamo implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
if (!config.getConfig("secretrooms.hide")) return null;
if ( SecretRoomsModule.BlockCamoTrapDoor.isInstance(accessor.getBlock()) ){
return this.getTrapDoorBlock(accessor);
}
else if ( SecretRoomsModule.BlockTorchLever.isInstance(accessor.getBlock()) ){
return new ItemStack(Block.torchWood);
}
else if (accessor.getNBTData() != null){
NBTTagCompound tag = accessor.getNBTData();
if (tag.hasKey("copyID") && tag.hasKey("copyMeta")){
int copyID = accessor.getNBTInteger(tag, "copyID");
int copyMeta = accessor.getNBTInteger(tag, "copyMeta");
return new ItemStack(copyID, 1, copyMeta);
}
}
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) {
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
private ItemStack getTrapDoorBlock(IWailaDataAccessor accessor){
// modify coordinates to get hinge Block.
int i = accessor.getMetadata();
int j = accessor.getPosition().blockX;
int k = accessor.getPosition().blockZ;
if ((i & 3) == 0)
{
k++;
}
if ((i & 3) == 1)
{
k--;
}
if ((i & 3) == 2)
{
j++;
}
if ((i & 3) == 3)
{
j--;
}
int blockID = accessor.getWorld().getBlockId(j, accessor.getPosition().blockY, k);
int blockMeta = accessor.getWorld().getBlockMetadata(j, accessor.getPosition().blockY, k);
return new ItemStack(blockID, 1, blockMeta);
}
}
@@ -0,0 +1,44 @@
package mcp.mobius.waila.addons.secretrooms;
import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class SecretRoomsModule {
public static Class TileEntityCamo = null;
public static Class BlockTorchLever = null;
public static Class BlockCamoTrapDoor = null;
public static void register(){
try{
Class SecretRooms = Class.forName("com.github.AbrarSyed.secretroomsmod.common.SecretRooms");
Waila.log.log(Level.INFO, "SecretRooms mod found.");
} catch (ClassNotFoundException e){
Waila.log.log(Level.INFO, "[SecretRooms] SecretRooms mod not found.");
return;
}
try{
TileEntityCamo = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.TileEntityCamo");
BlockTorchLever = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.BlockTorchLever");
BlockCamoTrapDoor = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.BlockCamoTrapDoor");
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARNING, "[SecretRooms] Class not found. " + e);
return;
} catch (Exception e) {
Waila.log.log(Level.WARNING, "[SecretRooms] Error while loading module. " + e);
return;
}
ModuleRegistrar.instance().addConfig("SecretRooms", "secretrooms.hide");
ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), TileEntityCamo);
ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockTorchLever);
ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockCamoTrapDoor);
ModuleRegistrar.instance().registerSyncedNBTKey("copyID", TileEntityCamo);
ModuleRegistrar.instance().registerSyncedNBTKey("copyMeta", TileEntityCamo);
}
}
@@ -0,0 +1,69 @@
package mcp.mobius.waila.addons.statues;
import java.util.List;
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.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDHandlerStatues 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) {
try {
String skinName = (String)StatuesModule.skinName.get(accessor.getTileEntity());
if (skinName.equals("")){
TileEntity belowEnt = accessor.getWorld().getBlockTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ);
if (StatuesModule.TileEntityStatue.isInstance(belowEnt))
skinName = (String)StatuesModule.skinName.get(belowEnt);
}
if (skinName.equals("")){
currenttip.clear();
currenttip.add(WHITE + "Statue : Unknown");
} else {
currenttip.clear();
currenttip.add(WHITE + "Statue : " + skinName);
}
} catch (Exception e) {
currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
}
/*
String skinName = accessor.getNBTData().getString("skin");
if (skinName.equals("")){
if (accessor.getWorld().getBlockTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ) != null){
}
}
*/
return currenttip;
}
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
currenttip.add(BLUE + ITALIC + "Statues" );
return currenttip;
}
}
@@ -0,0 +1,39 @@
package mcp.mobius.waila.addons.statues;
import java.lang.reflect.Field;
import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class StatuesModule {
public static Class TileEntityStatue = null;
public static Field skinName = null;
public static void register(){
try{
Class Statues = Class.forName("info.jbcs.minecraft.statues.Statues");
Waila.log.log(Level.INFO, "Statues mod found.");
} catch (ClassNotFoundException e){
Waila.log.log(Level.INFO, "[Statues] Statues mod not found.");
return;
}
try{
TileEntityStatue = Class.forName("info.jbcs.minecraft.statues.TileEntityStatue");
skinName = TileEntityStatue.getDeclaredField("skinName");
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARNING, "[Statues] Class not found. " + e);
return;
} catch (NoSuchFieldException e){
Waila.log.log(Level.WARNING, "[Statues] Class not found. " + e);
return;
}
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(), TileEntityStatue);
ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(), TileEntityStatue);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStatue);
}
}
@@ -0,0 +1,150 @@
package mcp.mobius.waila.addons.stevescarts;
import java.util.ArrayList;
import java.util.List;
import codechicken.lib.math.MathHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDCargoManager implements IWailaDataProvider {
private static String colors[] = {"NA", "Red", "Blue", "Yellow", "Green", "Dis."};
private static String sides[] = {"Yellow", "Blue", "Green", "Red"};
@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) {
if (!config.getConfig("stevescarts.showall")) return currenttip;
if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
currenttip.add(ITALIC + "Press shift for more data");
return currenttip;
}
NBTTagCompound tag = accessor.getNBTData();
if (config.getConfig("stevescarts.colorblind")){
int side = accessor.getSide().ordinal() - 2;
if (side >= 0)
currenttip.add("Looking at side " + WHITE + sides[side]);
}
int layout = accessor.getNBTInteger(tag, "layout");
switch(layout){
case 0:
currenttip.add("Slots : "+ WHITE + "Shared");
break;
case 1:
currenttip.add("Slots : "+ WHITE + "By side");
break;
case 2:
currenttip.add("Slots : "+ WHITE + "By color");
break;
}
try{
ArrayList<Object> itemSelection = (ArrayList<Object>) StevesCartsModule.ItemSelections.get(accessor.getTileEntity());
int toCart = accessor.getNBTInteger(tag, "tocart");
int doReturn = accessor.getNBTInteger(tag, "doReturn");
for (int i = 0; i < 4; i++){
int target = accessor.getNBTInteger(tag, "target" + String.valueOf(i));
int color = accessor.getNBTInteger(tag, "color" + String.valueOf(i));
int amount = accessor.getNBTInteger(tag, "amount" + String.valueOf(i));
if (color == 5) continue;
String direction = (toCart & (1 << i)) != 0 ? "Load" : "Unload";
String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont.";
String sAmount = amount == 0 ? "All" : String.valueOf(this.getAmount(amount) + " " + this.getAmountType(amount));
String selection = (String) StevesCartsModule.GetSelectionName.invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target)));
currenttip.add(String.format("Side %s %s[ %s ]%s[ %s , %s]%s[ %s ]", WHITE + colors[color] + GRAY,
TAB + ALIGNRIGHT, WHITE + selection + GRAY,
TAB + ALIGNRIGHT, WHITE + direction + GRAY,
TAB + ALIGNRIGHT + WHITE + shouldReturn + GRAY,
TAB + ALIGNRIGHT, WHITE + sAmount + GRAY));
}
} catch (Exception e) {
currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
}
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
public int getAmount(int id)
{
switch (id)
{
case 1:
return 1;
case 2:
return 3;
case 3:
return 8;
case 4:
return 16;
case 5:
return 32;
case 6:
return 64;
case 7:
return 1;
case 8:
return 2;
case 9:
return 3;
case 10:
return 5;
default:
return 0;
}
}
//0 - MAX
//1 - Items
//2 - Stacks
public String getAmountType(int id)
{
if (id <= 6)
{
return "I";
}
else
{
return "S";
}
}
}
@@ -0,0 +1,88 @@
package mcp.mobius.waila.addons.stevescarts;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
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 mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDCartAssembler 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) {
if (!config.getConfig("stevescarts.showall")) return currenttip;
if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
currenttip.add(ITALIC + "Press shift for more data");
return currenttip;
}
int currTime = accessor.getNBTInteger(accessor.getNBTData(), "currentTime");
int maxTime = accessor.getNBTInteger(accessor.getNBTData(), "maxTime");
int isAssembling = accessor.getNBTInteger(accessor.getNBTData(), "isAssembling");
NBTTagList slots = accessor.getNBTData().getTagList("Items");
boolean hasOutput = false;
Item ItemCartModule = null;
try {
ItemCartModule = (Item)StevesCartsModule.ItemCartModule.get(null);
} catch (Exception e) {
currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
return currenttip;
}
for (int i = 0; i < slots.tagCount(); i++){
NBTTagCompound subtag = (NBTTagCompound)(slots.tagAt(i));
byte slot = subtag.getByte("Slot");
if (slot == 30)
hasOutput = true;
}
if (isAssembling == 1){
currenttip.add(String.format("Time remaining : %.1f sec", (maxTime - currTime) / 20.0f));
NBTTagCompound output = accessor.getNBTData().getCompoundTag("Output");
short outID = output.getShort("id");
byte[] metas = output.getCompoundTag("tag").getByteArray("Modules");
for (byte b : metas){
currenttip.add(new ItemStack(ItemCartModule, 1, b).getDisplayName());
}
}
else
if (hasOutput)
currenttip.add(String.format("Time remaining : <Done>"));
else
currenttip.add(String.format("Time remaining : <Idle>"));
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
@@ -0,0 +1,126 @@
package mcp.mobius.waila.addons.stevescarts;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDLiquidManager implements IWailaDataProvider {
private static String colors[] = {"NA", "Red", "Blue", "Yellow", "Green", "Dis."};
private static String sides[] = {"Yellow", "Blue", "Green", "Red"};
@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) {
if (!config.getConfig("stevescarts.showall")) return currenttip;
if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
currenttip.add(ITALIC + "Press shift for more data");
return currenttip;
}
NBTTagCompound tag = accessor.getNBTData();
if (config.getConfig("stevescarts.colorblind")){
int side = accessor.getSide().ordinal() - 2;
if (side >= 0)
currenttip.add("Looking at side " + WHITE + sides[side]);
}
int layout = accessor.getNBTInteger(tag, "layout");
switch(layout){
case 0:
currenttip.add("Tanks : "+ WHITE + "Shared");
break;
case 1:
currenttip.add("Tanks : "+ WHITE + "By side");
break;
case 2:
currenttip.add("Tanks : "+ WHITE + "By color");
break;
}
int toCart = accessor.getNBTInteger(tag, "tocart");
int doReturn = accessor.getNBTInteger(tag, "doReturn");
for (int i = 0; i < 4; i++){
int target = accessor.getNBTInteger(tag, "target" + String.valueOf(i));
int color = accessor.getNBTInteger(tag, "color" + String.valueOf(i));
int amount = accessor.getNBTInteger(tag, "amount" + String.valueOf(i));
String fluidName = "<Empty>";
int fluidAmount = 0;
if (tag.hasKey("Fluid" + i)){
fluidName = tag.getCompoundTag("Fluid" + i).getString("FluidName");
fluidAmount = tag.getCompoundTag("Fluid" + i).getInteger("Amount");
}
String fluidString = fluidAmount == 0 ? "<Empty>" : String.format("%s mB of %s", fluidAmount, fluidName);
if (color == 5) continue;
String direction = (toCart & (1 << i)) != 0 ? "Load" : "Unload";
String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont.";
String sAmount = amount == 0 ? "All" : String.valueOf(this.getMaxAmountBuckets(amount)) + " mB";
//String selection = (String) StevesCartsModule.GetSelectionName.invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target)));
currenttip.add(String.format("Side %s %s[ %s ]%s[ %s , %s]%s[ %s ]", WHITE + colors[color] + GRAY,
TAB + ALIGNRIGHT, WHITE + fluidString + GRAY,
TAB + ALIGNRIGHT, WHITE + direction + GRAY,
TAB + ALIGNRIGHT + WHITE + shouldReturn + GRAY,
TAB + ALIGNRIGHT, WHITE + sAmount + GRAY));
}
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
public int getMaxAmountBuckets(int id) {
switch(id) {
case 1:
return 250;
case 2:
return 500;
case 3:
return 750;
case 4:
return 1000;
case 5:
return 2000;
case 6:
return 3000;
case 7:
return 5000;
case 8:
return 7500;
case 9:
return 10000;
case 10:
return 15000;
default:
return 0;
}
}
}
@@ -0,0 +1,85 @@
package mcp.mobius.waila.addons.stevescarts;
import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaEntityAccessor;
import mcp.mobius.waila.api.IWailaEntityProvider;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDMinecartModular implements IWailaEntityProvider {
@Override
public Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config) {
return null;
}
@Override
public List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
if (currenttip.get(0).contains("entity.StevesCarts.Minecart")){
currenttip.remove(0);
currenttip.add(WHITE + "Modular Minecart");
}
return currenttip;
}
@Override
public List<String> getWailaBody(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
if (!config.getConfig("stevescarts.showall")) return currenttip;
if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
currenttip.add(ITALIC + "Press shift for more data");
return currenttip;
}
Item ItemCartModule = null;
try {
ItemCartModule = (Item)StevesCartsModule.ItemCartModule.get(null);
} catch (Exception e) {
currenttip = WailaExceptionHandler.handleErr(e, accessor.getEntity().getClass().getName(), currenttip);
return currenttip;
}
NBTTagCompound tag = accessor.getNBTData();
if (tag.hasKey("Modules")){
byte[] metas = tag.getByteArray("Modules");
for (int i = 0; i < metas.length; i++){
if (tag.hasKey("module" + String.valueOf(i) + "Fuel")){
int fuel = accessor.getNBTInteger(tag, "module" + String.valueOf(i) + "Fuel");
currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " [ " + WHITE + fuel + GRAY + " POW ]");
} else if (tag.hasKey("module" + String.valueOf(i) + "Fluid")){
NBTTagCompound subtag = tag.getCompoundTag("module" + String.valueOf(i) + "Fluid");
if (subtag.hasKey("Amount")){
int amount = accessor.getNBTInteger(subtag, "Amount");
String fluid = subtag.getString("FluidName");
currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " [ " + WHITE + String.valueOf(amount) + GRAY + " mB of " + WHITE + fluid + GRAY + " ]");
} else {
currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " < " + WHITE + "Empty" + GRAY + " > ");
}
}else{
currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName());
}
}
}
return currenttip;
}
@Override
public List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
}
@@ -0,0 +1,78 @@
package mcp.mobius.waila.addons.stevescarts;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class StevesCartsModule {
public static Class TileEntityCartAssembler = null;
public static Class TileEntityCargo = null;
public static Class TileEntityLiquid = null;
public static Class MinecartModular = null;
public static Class StevesItems = null;
public static Class CargoItemSelection = null;
public static Field ItemCartComponent = null; //Items.component
public static Field ItemCartModule = null; //Items.modules
public static Field ItemSelections = null; //TileEntityCargo.itemSelections
public static Method GetSelectionName = null; // CargoItemSelection.getName
public static void register(){
try{
Class ModStevesCarts = Class.forName("vswe.stevescarts.StevesCarts");
Waila.log.log(Level.INFO, "StevesCarts mod found.");
} catch (ClassNotFoundException e){
Waila.log.log(Level.INFO, "[StevesCarts] StevesCarts mod not found.");
return;
}
try{
TileEntityCartAssembler = Class.forName("vswe.stevescarts.TileEntities.TileEntityCartAssembler");
TileEntityCargo = Class.forName("vswe.stevescarts.TileEntities.TileEntityCargo");
TileEntityLiquid = Class.forName("vswe.stevescarts.TileEntities.TileEntityLiquid");
MinecartModular = Class.forName("vswe.stevescarts.Carts.MinecartModular");
StevesItems = Class.forName("vswe.stevescarts.Items.Items");
CargoItemSelection = Class.forName("vswe.stevescarts.Helpers.CargoItemSelection");
ItemCartComponent = StevesItems.getDeclaredField("component");
ItemCartModule = StevesItems.getDeclaredField("modules");
ItemSelections = TileEntityCargo.getDeclaredField("itemSelections");
GetSelectionName = CargoItemSelection.getDeclaredMethod("getName");
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARNING, "[StevesCarts] Class not found. " + e);
return;
} catch (NoSuchFieldException e) {
Waila.log.log(Level.WARNING, "[StevesCarts] Field not found. " + e);
return;
} catch (NoSuchMethodException e) {
Waila.log.log(Level.WARNING, "[StevesCarts] Method not found. " + e);
return;
} catch (Exception e) {
Waila.log.log(Level.WARNING, "[StevesCarts] Error while loading module. " + e);
return;
}
ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.showall");
ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.colorblind");
ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.shifttoggle");
ModuleRegistrar.instance().registerBodyProvider(new HUDCartAssembler(), TileEntityCartAssembler);
ModuleRegistrar.instance().registerBodyProvider(new HUDCargoManager(), TileEntityCargo);
ModuleRegistrar.instance().registerBodyProvider(new HUDLiquidManager(), TileEntityLiquid);
ModuleRegistrar.instance().registerHeadProvider(new HUDMinecartModular(), MinecartModular);
ModuleRegistrar.instance().registerBodyProvider(new HUDMinecartModular(), MinecartModular);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCartAssembler);
ModuleRegistrar.instance().registerSyncedNBTKey("*", MinecartModular);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCargo);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityLiquid);
}
}
@@ -0,0 +1,108 @@
package mcp.mobius.waila.addons.thaumcraft;
import java.util.List;
import java.util.Map;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.StringUtils;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.utils.NBTUtil;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDHandlerIAspectContainer 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) {
if (!config.getConfig("thaumcraft.aspects")) return currenttip;
ItemStack headSlot = accessor.getPlayer().inventory.armorInventory[3];
if (headSlot == null) return currenttip;
boolean hasReveal = ThaumcraftModule.ItemGoggles.isInstance(headSlot.getItem()) ||
(ThaumcraftModule.ItemRevealingHelm != null && ThaumcraftModule.ItemRevealingHelm.isInstance(headSlot.getItem())) ||
(ThaumcraftModule.ItemGemHelm != null && ThaumcraftModule.ItemGemHelm.isInstance(headSlot.getItem()));
if (!hasReveal) return currenttip;
NBTTagCompound tag = accessor.getNBTData();
if (tag.hasKey("Aspect") && tag.hasKey("Amount") && !tag.getString("Aspect").equals("")){
String aspect = Character.toUpperCase(tag.getString("Aspect").charAt(0)) + tag.getString("Aspect").substring(1);
currenttip.add(this.getAspectString(tag, "Aspect", "Amount", accessor));
}
if (tag.hasKey("aspect") && tag.hasKey("amount") && !tag.getString("aspect").equals("")){
String aspect = Character.toUpperCase(tag.getString("aspect").charAt(0)) + tag.getString("aspect").substring(1);
currenttip.add(this.getAspectString(tag, "aspect", "amount", accessor));
}
if (tag.hasKey("Aspects")){
NBTTagList taglist = tag.getTagList("Aspects");
for (int i = 0; i < taglist.tagCount(); i++){
NBTTagCompound subtag = (NBTTagCompound)taglist.tagAt(i);
if (subtag.hasKey("amount") && subtag.hasKey("key") && !subtag.getString("key").equals("")){
currenttip.add(this.getAspectString(subtag, "key", "amount", accessor));
}
}
}
return currenttip;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return currenttip;
}
private String getAspectString(NBTTagCompound tag, String keyAspect, String keyAmount, IWailaDataAccessor accessor){
String aspect = tag.getString(keyAspect);
aspect = knowAspect(aspect, accessor) ? aspect : "????";
aspect = Character.toUpperCase(aspect.charAt(0)) + aspect.substring(1);
String amount = String.valueOf(NBTUtil.getNBTInteger(tag, keyAmount));
return String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount);
}
private boolean knowAspect(String name, IWailaDataAccessor accessor){
try{
Object proxy = ThaumcraftModule.TC_proxy.get(null);
Object known = ThaumcraftModule.getKnownAspects.invoke(proxy, (Object[])null);
Object listAspc = ((Map<String, Object>)known).get(accessor.getPlayer().username);
//Object research = ThaumcraftModule.playerResearch.get(proxy);
//Object aspect = ThaumcraftModule.getAspect.invoke(null, name);
//Object knownaspects = ThaumcraftModule.aspectsDiscovered.get(research);
//Boolean known = (Boolean)ThaumcraftModule.hasDiscoveredAspect.invoke(research, accessor.getPlayer().username, aspect);
Object[] aspects = (Object[])ThaumcraftModule.list_getAspects.invoke(listAspc);
for (Object o : aspects){
if (ThaumcraftModule.aspect_tag.get(o).equals(name)){
return true;
}
}
return false;
} catch (Exception e){
WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
return false;
}
}
}
@@ -1,57 +1,92 @@
package mcp.mobius.waila.addons.thaumcraft;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import mcp.mobius.waila.utils.WailaExceptionHandler;
public class ThaumcraftModule {
public static Class BlockMagicalLeaves = null;
public static Class BlockCustomPlant = null;
public static Class IAspectContainer = null;
public static Class TileAlchemyFurnace = null;
public static Class ItemGoggles = null;
public static Class ItemRevealingHelm = null;
public static Class ItemGemHelm = null;
public static Class TileCrystalCapacitor = null;
public static Field TileCrystalCapacitor_StoredVis = null;
public static Field TileCrystalCapacitor_MaxVis = null;
public static Class Thaumcraft = null;
public static Class TCClientProxy = null;
public static Class TCCommonProxy = null;
//public static Class PlayerKnowledge = null;
public static Class Aspect = null;
public static Class AspectList = null;
public static Field TC_proxy = null; //Thaumcraft.proxy
//public static Field playerResearch = null; //ClientProxy.playerResearch
//public static Field aspectsDiscovered = null; //PlayerKnowledge.aspectsDiscovered
public static Field aspect_tag = null; //Aspect.tag
//public static Method hasDiscoveredAspect = null; //PlayerKnowledge.hasDiscoveredAspect
//public static Method getAspect = null; //Aspect.getAspect
public static Method getKnownAspects = null; //CommonProxy.getKnownAspects
public static Method list_getAspects = null; //AspectList.getAspects
public static void register(){
try{
Class ModThaumcraft = Class.forName("thaumcraft.common.Thaumcraft");
Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft");
Waila.log.log(Level.INFO, "Thaumcraft mod found.");
} catch (ClassNotFoundException e){
Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found.");
return;
}
try{
ItemRevealingHelm = Class.forName("vazkii.tinkerer.common.item.ItemRevealingHelm");
} catch (ClassNotFoundException e){ }
try{
BlockMagicalLeaves = Class.forName("thaumcraft.common.world.BlockMagicalLeaves");
BlockCustomPlant = Class.forName("thaumcraft.common.world.BlockCustomPlant");
ItemGemHelm = Class.forName("vazkii.tinkerer.common.item.kami.armor.ItemGemHelm");
} catch (ClassNotFoundException e){ }
try{
IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer");
TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace");
ItemGoggles = Class.forName("thaumcraft.common.items.armor.ItemGoggles");
TCClientProxy = Class.forName("thaumcraft.client.ClientProxy");
TCCommonProxy = Class.forName("thaumcraft.common.CommonProxy");
//PlayerKnowledge = Class.forName("thaumcraft.common.lib.research.PlayerKnowledge");
Aspect = Class.forName("thaumcraft.api.aspects.Aspect");
AspectList = Class.forName("thaumcraft.api.aspects.AspectList");
TileCrystalCapacitor = Class.forName("thaumcraft.common.tiles.TileCrystalCapacitor");
TileCrystalCapacitor_StoredVis = TileCrystalCapacitor.getField("storedVis");
TileCrystalCapacitor_MaxVis = TileCrystalCapacitor.getField("maxVis");
TC_proxy = Thaumcraft.getDeclaredField("proxy");
//playerResearch = TCClientProxy.getDeclaredField("playerResearch");
//aspectsDiscovered = PlayerKnowledge.getDeclaredField("aspectsDiscovered");
//playerResearch.setAccessible(true);
aspect_tag = Aspect.getDeclaredField("tag");
aspect_tag.setAccessible(true);
//hasDiscoveredAspect = PlayerKnowledge.getDeclaredMethod("hasDiscoveredAspect", String.class, Aspect);
//getAspect = Aspect.getDeclaredMethod("getAspect", String.class);
getKnownAspects = TCCommonProxy.getDeclaredMethod("getKnownAspects");
list_getAspects = AspectList.getDeclaredMethod("getAspects");
} catch (ClassNotFoundException 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){
Waila.log.log(Level.WARNING, "[Thaumcraft] Field not found." + e);
} catch (Exception e){
Waila.log.log(Level.WARNING, "[Thaumcraft] Unhandled exception." + e);
//WailaExceptionHandler.handleErr(e, null, null);
return;
// } catch (Exception e){
// mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Unhandled exception." + e);
// return;
}
ModuleRegistrar.instance().addConfig("Thaumcraft", "thaumcraft.storedvis");
ModuleRegistrar.instance().registerStackProvider(new HUDHandlerLeaves(), BlockMagicalLeaves);
ModuleRegistrar.instance().registerStackProvider(new HUDHandlerPlants(), BlockCustomPlant);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCrystalCapacitor);
}
ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
ModuleRegistrar.instance().registerSyncedNBTKey("*", IAspectContainer);
}
}
@@ -2,15 +2,15 @@ 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;
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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
public class HUDHandlerEnergyCell implements IWailaDataProvider {
@@ -4,11 +4,11 @@ import java.lang.reflect.InvocationTargetException;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import mcp.mobius.waila.WailaExceptionHandler;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.utils.WailaExceptionHandler;
public class HUDHandlerIEnergyHandler 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 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;
import mcp.mobius.waila.utils.WailaExceptionHandler;
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,7 +4,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.logging.Level;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -119,6 +119,12 @@ public class ThermalExpansionModule {
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerConduitFluid(), BlockMultipart);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerConduitItem(), BlockMultipart);
ModuleRegistrar.instance().registerSyncedNBTKey("*", IEnergyHandler);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEnergyCell);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTank);
ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);
ModuleRegistrar.instance().registerSyncedNBTKey("*", ISecureTile);
ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart);
}
@@ -32,7 +32,10 @@ public class TwilightForestModule {
ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFRoots);
ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFPlant);
//ExternalModulesHandler.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFSapling);
//ExternalModulesHandler.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFSapling);
ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockTFRoots);
ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockTFPlant);
}
}
@@ -2,10 +2,9 @@ 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;
@@ -15,49 +14,46 @@ 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 {
//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");
static Block mobSpawner = Block.mobSpawner;
static Block crops = Block.crops;
static Block melonStem = Block.melonStem;
static Block pumpkinStem = Block.pumpkinStem;
static Block carrot = Block.carrot;
static Block potato = Block.potato;
static Block lever = Block.lever;
static Block repeaterIdle = Block.redstoneRepeaterIdle;
static Block repeaterActv = Block.redstoneRepeaterActive;
static Block comparatorIdl = Block.redstoneComparatorIdle;
static Block comparatorAct = Block.redstoneComparatorActive;
static Block redstone = Block.redstoneWire;
static Block jukebox = Block.jukebox;
static Block cocoa = Block.cocoaPlant;
static Block netherwart = Block.netherStalk;
static Block silverfish = Block.silverfish;
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
Block block = accessor.getBlock();
Block block = accessor.getBlock();
if (block.equals(silverfish)){
if (block == silverfish && config.getConfig("vanilla.silverfish")){
int metadata = accessor.getMetadata();
switch(metadata){
case 0:
return new ItemStack(Blocks.stone);
return new ItemStack(Block.stone);
case 1:
return new ItemStack(Blocks.cobblestone);
return new ItemStack(Block.cobblestone);
case 2:
return new ItemStack(Blocks.brick_block);
return new ItemStack(Block.stoneBrick);
default:
return null;
}
}
if (block.equals(redstone)){
return new ItemStack(Items.redstone);
if (block == redstone){
return new ItemStack(Item.redstone);
}
return null;
@@ -71,7 +67,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
/* Mob spawner handler */
if (block == mobSpawner && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){
String name = currenttip.get(0);
String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).func_145881_a().getEntityNameToSpawn();
String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).getSpawnerLogic().getEntityNameToSpawn();
currenttip.set(0, String.format("%s (%s)", name, mobname));
}
@@ -87,8 +83,9 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
Block block = accessor.getBlock();
/* Crops */
if (config.getConfig("vanilla.growthvalue"))
if (block == crops || block == melonStem || block == pumpkinStem || block == carrot || block == potato){
boolean iscrop = crops.getClass().isInstance(block); //Done to cover all inheriting mods
if (config.getConfig("general.showcrop"))
if (iscrop || 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));
@@ -97,7 +94,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
return currenttip;
}
if (block == cocoa){
if (block == cocoa && config.getConfig("general.showcrop")){
float growthValue = ((accessor.getMetadata() >> 2) / 2.0F) * 100.0F;
if (growthValue < 100.0)
@@ -107,7 +104,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
return currenttip;
}
if (block == netherwart){
if (block == netherwart && config.getConfig("general.showcrop")){
float growthValue = (accessor.getMetadata() / 3.0F) * 100.0F;
if (growthValue < 100.0)
currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
@@ -147,8 +144,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
currenttip.add(String.format("%s : %s" , LangUtil.translateG("hud.msg.power"), accessor.getMetadata()));
return currenttip;
}
/*
if (config.getConfig("vanilla.jukebox"))
if (block == jukebox){
NBTTagCompound tag = accessor.getNBTData();
@@ -160,8 +156,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
currenttip.add(LangUtil.translateG("hud.msg.empty"));
}
}
*/
return currenttip;
}
@@ -172,35 +167,52 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
public static void register(){
ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.spawntype");
ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.growthvalue");
ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.leverstate");
ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.repeater");
ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.comparator");
ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.redstone");
ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.silverfish");
ModuleRegistrar.instance().addConfigRemote("VanillaMC", "vanilla.jukebox");
IWailaDataProvider provider = new HUDHandlerVanilla();
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().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().registerSyncedNBTKey("*", Block.mobSpawner.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.crops.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.melonStem.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.pumpkinStem.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.carrot.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.potato.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.lever.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneRepeaterIdle.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneRepeaterActive.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneComparatorIdle.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneComparatorActive.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneWire.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.jukebox.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.cocoaPlant.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.netherStalk.getClass());
ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.silverfish.getClass());
ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
//ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle);
}
+1
View File
@@ -4,6 +4,7 @@ import java.util.List;
import net.minecraft.item.ItemStack;
@Deprecated
public interface IWailaBlock {
/*
* Use this method to return an item stack in case the default lookup system fails.
@@ -1,7 +1,5 @@
package mcp.mobius.waila.api;
import java.util.List;
import net.minecraft.item.ItemStack;
public interface IWailaBlockDecorator {
@@ -24,5 +24,5 @@ public interface IWailaConfigHandler {
/* Returns the current value of an option (true/false) with a default value true if not set*/
public boolean getConfig(String key);
public void setConfig(String key, boolean value);
//public void setConfig(String key, boolean value);
}
+10 -2
View File
@@ -2,18 +2,25 @@ package mcp.mobius.waila.api;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
/* The Accessor is used to get some basic data out of the game without having to request
* direct access to the game engine.
* It will also return things that are unmodified by the overriding systems (like getWailaStack).
*/
public interface IWailaDataAccessor {
World getWorld();
EntityPlayer getPlayer();
Block getBlock();
//int getBlockID();
int getBlockID();
int getMetadata();
TileEntity getTileEntity();
MovingObjectPosition getPosition();
@@ -22,4 +29,5 @@ public interface IWailaDataAccessor {
int getNBTInteger(NBTTagCompound tag, String keyname);
double getPartialFrame();
ForgeDirection getSide();
ItemStack getStack();
}
+30 -1
View File
@@ -1,4 +1,33 @@
package mcp.mobius.waila.api;
public interface IWailaDataProvider extends IWailaBlock{
import java.util.List;
import net.minecraft.item.ItemStack;
public interface IWailaDataProvider{
/*
* Use this method to return an item stack in case the default lookup system fails.
* Return null if you want to use the default lookup system.
* You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities
*/
ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
/* Waila HUD is divided into 3 zones. The head corresponds to the item name,
* body to where you mostly want to put informations, and I reserve the tail for modname display
*/
/* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD.
* You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack().
* ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info.
* currenttip represents the current list of text lines in the tooltip zone.
* For example, getWailaHead() will have the current item name as currenttip.
* You can modify the tips, add more, remove some, etc.
* When you are done, just returns the currenttip and it will display in Waila.
*
* Always return the currenttip is you don't want to modify the current zone.
*/
List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
}
@@ -0,0 +1,24 @@
package mcp.mobius.waila.api;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
/* The Accessor is used to get some basic data out of the game without having to request
* direct access to the game engine.
* It will also return things that are unmodified by the overriding systems (like getWailaStack).
*/
public interface IWailaEntityAccessor {
World getWorld();
EntityPlayer getPlayer();
Entity getEntity();
MovingObjectPosition getPosition();
Vec3 getRenderingPosition();
NBTTagCompound getNBTData();
int getNBTInteger(NBTTagCompound tag, String keyname);
double getPartialFrame();
}
@@ -0,0 +1,16 @@
package mcp.mobius.waila.api;
import java.util.List;
import net.minecraft.entity.Entity;
public interface IWailaEntityProvider {
/* A way to get an override on the entity returned by the raytracing */
Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config);
/* The classical HEAD/BODY/TAIL text getters */
List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
List<String> getWailaBody(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
}
@@ -0,0 +1,28 @@
package mcp.mobius.waila.api;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
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;
/* The Accessor is used to get some basic data out of the game without having to request
* direct access to the game engine.
* It will also return things that are unmodified by the overriding systems (like getWailaStack).
*/
public interface IWailaFMPAccessor {
World getWorld();
EntityPlayer getPlayer();
TileEntity getTileEntity();
MovingObjectPosition getPosition();
NBTTagCompound getNBTData();
NBTTagCompound getFullNBTData();
int getNBTInteger(NBTTagCompound tag, String keyname);
double getPartialFrame();
Vec3 getRenderingPosition();
String getID();
}
@@ -0,0 +1,7 @@
package mcp.mobius.waila.api;
import net.minecraft.item.ItemStack;
public interface IWailaFMPDecorator {
void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config);
}
@@ -0,0 +1,12 @@
package mcp.mobius.waila.api;
import java.util.List;
import net.minecraft.item.ItemStack;
public interface IWailaFMPProvider {
/* The classical HEAD/BODY/TAIL text getters */
List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
}
+34 -2
View File
@@ -7,18 +7,50 @@ 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 */
@Deprecated
public void registerHeadProvider (IWailaDataProvider dataProvider, int blockID);
@Deprecated
public void registerBodyProvider (IWailaDataProvider dataProvider, int blockID);
@Deprecated
public void registerTailProvider (IWailaDataProvider dataProvider, int blockID);
/* Register a stack overrider for the given blockID */
@Deprecated
public void registerStackProvider(IWailaDataProvider dataProvider, int blockID);
public void registerStackProvider(IWailaDataProvider dataProvider, Class block);
/* Same thing, but works on a class hierarchy instead */
public void registerHeadProvider (IWailaDataProvider dataProvider, Class block);
public void registerBodyProvider (IWailaDataProvider dataProvider, Class block);
public void registerTailProvider (IWailaDataProvider dataProvider, Class block);
/* Entity text registration methods */
public void registerHeadProvider (IWailaEntityProvider dataProvider, Class entity);
public void registerBodyProvider (IWailaEntityProvider dataProvider, Class entity);
public void registerTailProvider (IWailaEntityProvider dataProvider, Class entity);
public void registerOverrideEntityProvider (IWailaEntityProvider dataProvider, Class entity);
/* FMP Providers */
public void registerHeadProvider(IWailaFMPProvider dataProvider, String name);
public void registerBodyProvider(IWailaFMPProvider dataProvider, String name);
public void registerTailProvider(IWailaFMPProvider dataProvider, String name);
/* The block decorators */
public void registerBlockDecorator (IWailaBlockDecorator decorator, Class block);
@Deprecated
public void registerDecorator (IWailaBlockDecorator decorator, int blockID);
public void registerDecorator (IWailaBlockDecorator decorator, Class block);
public void registerDecorator (IWailaFMPDecorator decorator, String name);
/* Selective NBT key syncing. Will register a key to sync over the network for the given class (block, te or ent).
* Accept * as a ending wildcard
* registerNBTKey("bob.*", MyBlock.class)
* registerNBTKey("data.life", MyEntity.class)
* registerNBTKey("*", MyTileEntity.class) will reproduce the full tag syncing from 1.4.5
* */
public void registerSyncedNBTKey(String key, Class target);
/* UNUSED FOR NOW (Will be used for the ingame wiki */
public void registerDocTextFile (String filename);
public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item);
}
@@ -1,4 +1,4 @@
package mcp.mobius.waila;
package mcp.mobius.waila.api;
public class SpecialChars {
@@ -28,6 +28,13 @@ public class SpecialChars {
public static String ITALIC = MCStyle + "o";
public static String RESET = MCStyle + "r";
public static String WailaStyle = "\u00A4";
public static String WailaStyle = "\u00A4";
public static String WailaIcon = "\u00A5";
public static String TAB = WailaStyle + WailaStyle +"a";
public static String ALIGNRIGHT = WailaStyle + WailaStyle +"b";
public static String ALIGNCENTER = WailaStyle + WailaStyle +"c";
public static String HEART = WailaStyle + WailaIcon +"a";
public static String HHEART = WailaStyle + WailaIcon +"b";
public static String EHEART = WailaStyle + WailaIcon +"c";
}
+90 -34
View File
@@ -5,26 +5,28 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Set;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.handlers.HUDHandlerEntities;
import mcp.mobius.waila.overlay.OverlayConfig;
import mcp.mobius.waila.utils.Constants;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.Property;
public class ConfigHandler implements IWailaConfigHandler {
private static ConfigHandler instance = null;
private LinkedHashMap<String, ConfigModule> modules = new LinkedHashMap<String, ConfigModule>();
private ArrayList<String> serverconfigs = new ArrayList<String>();
/* SINGLETON */
private static ConfigHandler _instance = null;
private ConfigHandler() { _instance = this; }
public static ConfigHandler instance(){ return _instance == null ? new ConfigHandler() : _instance; }
/* === */
private LinkedHashMap<String, ConfigModule> modules = new LinkedHashMap<String, ConfigModule>();
private ArrayList<String> serverconfigs = new ArrayList<String>();
public HashMap<String, Boolean> forcedConfigs = new HashMap<String, Boolean>();
public Configuration config = null;
private ConfigHandler() {
instance = this;
}
public static ConfigHandler instance(){
if (ConfigHandler.instance == null)
ConfigHandler.instance = new ConfigHandler();
return ConfigHandler.instance;
}
public void addModule(String modName, HashMap<String, String> options){
this.addModule(modName, new ConfigModule(modName, options));
@@ -47,7 +49,15 @@ public class ConfigHandler implements IWailaConfigHandler {
return null;
}
private void saveModuleKey(String modName, String key){
config.get(Constants.CATEGORY_MODULES, key, true);
config.get(Constants.CATEGORY_SERVER , key, Constants.SERVER_FREE);
config.save();
}
public void addConfig(String modName, String key, String name){
this.saveModuleKey(modName, key);
if (!this.modules.containsKey(modName))
this.modules.put(modName, new ConfigModule(modName));
@@ -55,6 +65,8 @@ public class ConfigHandler implements IWailaConfigHandler {
}
public void addConfigServer(String modName, String key, String name){
this.saveModuleKey(modName, key);
if (!this.modules.containsKey(modName))
this.modules.put(modName, new ConfigModule(modName));
@@ -62,42 +74,86 @@ public class ConfigHandler implements IWailaConfigHandler {
this.serverconfigs.add(key);
}
@Override
public boolean getConfig(String key){
return this.getConfig(key, true);
}
@Override
public boolean getConfig(String key, boolean defvalue){
Waila.instance.config.load();
if (this.serverconfigs.contains(key) && !Waila.instance.serverPresent)
return false;
Property prop = Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, defvalue);
if (this.forcedConfigs.containsKey(key))
return this.forcedConfigs.get(key);
Property prop = config.get(Constants.CATEGORY_MODULES, key, defvalue);
return prop.getBoolean(defvalue);
}
public boolean isServerRequired(String key){
return this.serverconfigs.contains(key);
}
@Override
public boolean getConfig(String key){
return this.getConfig(key, true);
/* GENERAL ACCESS METHODS TO GET/SET VALUES IN THE CONFIG FILE */
public boolean getConfig(String category, String key, boolean default_){
Property prop = config.get(category, key, default_);
return prop.getBoolean(default_);
}
public void setConfig(String category, String key, boolean state){
config.getCategory(category).put(key, new Property(key,String.valueOf(state),Property.Type.BOOLEAN));
config.save();
}
public int getConfigInt(String key){
Waila.instance.config.load();
Property prop = Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, 0);
return prop.getInt();
}
public int getConfig(String category, String key, int default_){
Property prop = config.get(category, key, default_);
return prop.getInt();
}
@Override
public void setConfig(String key, boolean value){
Waila.instance.config.load();
Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, true).set(value);;
Waila.instance.config.save();
public void setConfig(String category, String key, int state){
config.getCategory(category).put(key, new Property(key,String.valueOf(state),Property.Type.INTEGER));
config.save();
}
public void setConfigInt(String key, int value){
Waila.instance.config.load();
Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, 0).set(value);;
Waila.instance.config.save();
/* Default config loading */
public void loadDefaultConfig(FMLPreInitializationEvent event){
config = new Configuration(event.getSuggestedConfigurationFile());
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, true);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, false);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, false);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true);
OverlayConfig.posX = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 5000).getInt();
OverlayConfig.posY = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 100).getInt();
OverlayConfig.alpha = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, 80).getInt();
OverlayConfig.bgcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR, 0x100010).getInt();
OverlayConfig.gradient1 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1, 0x5000ff).getInt();
OverlayConfig.gradient2 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2, 0x28007f).getInt();
OverlayConfig.fontcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR, 0xA0A0A0).getInt();
OverlayConfig.scale = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE, 100).getInt() / 100.0f;
HUDHandlerEntities.nhearts = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NHEARTS, 20).getInt();
HUDHandlerEntities.maxhpfortext = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MAXHP, 40).getInt();
config.getCategory(Constants.CATEGORY_MODULES).setComment("Those are the config keys defined in modules.\nServer side, it is used to enforce keys client side using the next section.");
config.getCategory(Constants.CATEGORY_SERVER).setComment("Any key set to true here will ensure that the client is using the configuration set in the 'module' section above.\nThis is useful for enforcing false to 'cheating' keys like silverfish.");
config.save();
}
}
@@ -3,6 +3,7 @@ package mcp.mobius.waila.api.impl;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagByte;
import net.minecraft.nbt.NBTTagCompound;
@@ -12,24 +13,26 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.utils.NBTUtil;
public class DataAccessor implements IWailaDataAccessor {
public class DataAccessorBlock implements IWailaDataAccessor {
public World world;
public EntityPlayer player;
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;
public long timeLastUpdate = System.currentTimeMillis();
public double partialFrame;
public ItemStack stack;
public static DataAccessor instance = new DataAccessor();
public static DataAccessorBlock instance = new DataAccessorBlock();
public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) {
this.set(_world, _player, _mop, null, 0.0);
@@ -39,11 +42,12 @@ 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.block = world.getBlock(_mop.blockX, _mop.blockY, _mop.blockZ);
this.blockID = world.getBlockId(_mop.blockX, _mop.blockY, _mop.blockZ);
this.block = Block.blocksList[this.blockID];
this.metadata = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ);
this.entity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
this.entity = world.getBlockTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
try{ this.stack = new ItemStack(this.blockID, 1, this.metadata); } catch (Exception e) {}
if (viewEntity != null){
double px = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks;
@@ -69,12 +73,10 @@ public class DataAccessor implements IWailaDataAccessor {
return this.block;
}
/*
@Override
public int getBlockID() {
return this.blockID;
}
*/
}
@Override
public int getMetadata() {
@@ -85,11 +87,9 @@ public class DataAccessor implements IWailaDataAccessor {
this.block = block;
}
/*
public void setBlockID(int val) {
this.blockID = val;
}
*/
}
public void setMetadata(int val) {
this.metadata = val;
@@ -119,15 +119,7 @@ public class DataAccessor implements IWailaDataAccessor {
@Override
public int getNBTInteger(NBTTagCompound tag, String keyname){
NBTBase subtag = tag.getTag(keyname);
if (subtag instanceof NBTTagInt)
return tag.getInteger(keyname);
if (subtag instanceof NBTTagShort)
return tag.getShort(keyname);
if (subtag instanceof NBTTagByte)
return tag.getByte(keyname);
return 0;
return NBTUtil.getNBTInteger(tag, keyname);
}
private boolean isTagCorrect(NBTTagCompound tag){
@@ -160,22 +152,20 @@ public class DataAccessor implements IWailaDataAccessor {
@Override
public ForgeDirection getSide(){
int side = this.getPosition().sideHit;
switch (side){
case 0:
return ForgeDirection.DOWN;
case 1:
return ForgeDirection.UP;
case 2:
return ForgeDirection.EAST;
case 3:
return ForgeDirection.WEST;
case 4:
return ForgeDirection.NORTH;
case 5:
return ForgeDirection.SOUTH;
}
return ForgeDirection.UNKNOWN;
return ForgeDirection.getOrientation(this.getPosition().sideHit);
}
public boolean isTimeElapsed(long time){
return System.currentTimeMillis() - this.timeLastUpdate >= time;
}
public void resetTimer(){
this.timeLastUpdate = System.currentTimeMillis();
}
@Override
public ItemStack getStack() {
return this.stack;
}
}
@@ -0,0 +1,122 @@
package mcp.mobius.waila.api.impl;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagByte;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagInt;
import net.minecraft.nbt.NBTTagShort;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import mcp.mobius.waila.api.IWailaEntityAccessor;
import mcp.mobius.waila.utils.NBTUtil;
public class DataAccessorEntity implements IWailaEntityAccessor {
public World world;
public EntityPlayer player;
public MovingObjectPosition mop;
public Vec3 renderingvec = null;
public Entity entity;
public NBTTagCompound remoteNbt = null;
public long timeLastUpdate = System.currentTimeMillis();
public double partialFrame;
public static DataAccessorEntity instance = new DataAccessorEntity();
public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) {
this.set(_world, _player, _mop, null, 0.0);
}
public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, EntityLivingBase viewEntity, double partialTicks) {
this.world = _world;
this.player = _player;
this.mop = _mop;
this.entity = _mop.entityHit;
if (viewEntity != null){
double px = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks;
double py = viewEntity.lastTickPosY + (viewEntity.posY - viewEntity.lastTickPosY) * partialTicks;
double pz = viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks;
this.renderingvec = Vec3.createVectorHelper(_mop.blockX - px, _mop.blockY - py, _mop.blockZ - pz);
this.partialFrame = partialTicks;
}
}
@Override
public World getWorld() {
return this.world;
}
@Override
public EntityPlayer getPlayer() {
return this.player;
}
@Override
public Entity getEntity() {
return this.entity;
}
@Override
public MovingObjectPosition getPosition() {
return this.mop;
}
@Override
public NBTTagCompound getNBTData() {
if (this.entity == null) return null;
if (this.isTagCorrect(this.remoteNbt))
return this.remoteNbt;
NBTTagCompound tag = new NBTTagCompound();
this.entity.writeToNBT(tag);
return tag;
}
private boolean isTagCorrect(NBTTagCompound tag){
if (tag == null){
this.timeLastUpdate = System.currentTimeMillis() - 250;
return false;
}
int x = tag.getInteger("x");
int y = tag.getInteger("y");
int z = tag.getInteger("z");
if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ)
return true;
else {
this.timeLastUpdate = System.currentTimeMillis() - 250;
return false;
}
}
@Override
public int getNBTInteger(NBTTagCompound tag, String keyname){
return NBTUtil.getNBTInteger(tag, keyname);
}
@Override
public Vec3 getRenderingPosition() {
return this.renderingvec;
}
@Override
public double getPartialFrame() {
return this.partialFrame;
}
public boolean isTimeElapsed(long time){
return System.currentTimeMillis() - this.timeLastUpdate >= time;
}
public void resetTimer(){
this.timeLastUpdate = System.currentTimeMillis();
}
}
@@ -0,0 +1,118 @@
package mcp.mobius.waila.api.impl;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import mcp.mobius.waila.api.IWailaFMPAccessor;
import mcp.mobius.waila.utils.NBTUtil;
public class DataAccessorFMP implements IWailaFMPAccessor {
public String id;
public World world;
public EntityPlayer player;
public MovingObjectPosition mop;
public Vec3 renderingvec = null;
public TileEntity entity;
public NBTTagCompound partialNBT = null;
public NBTTagCompound remoteNBT = null;
public long timeLastUpdate = System.currentTimeMillis();
public double partialFrame;
public static DataAccessorFMP instance = new DataAccessorFMP();
public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT, String id) {
this.set(_world, _player, _mop, _partialNBT, id, null, 0.0);
}
public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT, String id, Vec3 renderVec, double partialTicks) {
this.world = _world;
this.player = _player;
this.mop = _mop;
this.entity = world.getBlockTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
this.partialNBT = _partialNBT;
this.id = id;
this.renderingvec = renderVec;
this.partialFrame = partialTicks;
}
@Override
public World getWorld() {
return this.world;
}
@Override
public EntityPlayer getPlayer() {
return this.player;
}
@Override
public TileEntity getTileEntity() {
return this.entity;
}
@Override
public MovingObjectPosition getPosition() {
return this.mop;
}
@Override
public NBTTagCompound getNBTData() {
return this.partialNBT;
}
@Override
public NBTTagCompound getFullNBTData() {
if (this.entity == null) return null;
if (this.isTagCorrect(this.remoteNBT))
return this.remoteNBT;
NBTTagCompound tag = new NBTTagCompound();
this.entity.writeToNBT(tag);
return tag;
}
@Override
public int getNBTInteger(NBTTagCompound tag, String keyname) {
return NBTUtil.getNBTInteger(tag, keyname);
}
@Override
public double getPartialFrame() {
return this.partialFrame;
}
@Override
public Vec3 getRenderingPosition() {
return this.renderingvec;
}
@Override
public String getID() {
return this.id;
}
private boolean isTagCorrect(NBTTagCompound tag){
if (tag == null){
this.timeLastUpdate = System.currentTimeMillis() - 250;
return false;
}
int x = tag.getInteger("x");
int y = tag.getInteger("y");
int z = tag.getInteger("z");
if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ)
return true;
else {
this.timeLastUpdate = System.currentTimeMillis() - 250;
return false;
}
}
}
-5
View File
@@ -1,5 +0,0 @@
package mcp.mobius.waila.api.impl;
public enum Layout {
HEADER, BODY, FOOTER
}
+119 -26
View File
@@ -1,31 +1,43 @@
package mcp.mobius.waila.api.impl;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import mcp.mobius.waila.WailaExceptionHandler;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.IWailaBlock;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.network.Message0x01TERequest;
import mcp.mobius.waila.network.WailaPacketHandler;
import mcp.mobius.waila.api.IWailaEntityProvider;
import mcp.mobius.waila.network.Packet0x01TERequest;
import mcp.mobius.waila.network.Packet0x03EntRequest;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
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{
private ArrayList<IWailaDataProvider> headProviders = new ArrayList<IWailaDataProvider>();
private ArrayList<IWailaDataProvider> bodyProviders = new ArrayList<IWailaDataProvider>();
private ArrayList<IWailaDataProvider> tailProviders = new ArrayList<IWailaDataProvider>();
private ArrayList<IWailaDataProvider> headBlockProviders = new ArrayList<IWailaDataProvider>();
private ArrayList<IWailaDataProvider> bodyBlockProviders = new ArrayList<IWailaDataProvider>();
private ArrayList<IWailaDataProvider> tailBlockProviders = new ArrayList<IWailaDataProvider>();
private ArrayList<IWailaEntityProvider> headEntityProviders = new ArrayList<IWailaEntityProvider>();
private ArrayList<IWailaEntityProvider> bodyEntityProviders = new ArrayList<IWailaEntityProvider>();
private ArrayList<IWailaEntityProvider> tailEntityProviders = new ArrayList<IWailaEntityProvider>();
private Class prevBlock = null;
private Class prevTile = null;
public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessor accessor) {
public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorBlock accessor) {
Block block = accessor.getBlock();
int blockID = accessor.getBlockID();
if (IWailaBlock.class.isInstance(block)){
try{
@@ -49,19 +61,35 @@ public class MetaDataProvider{
return null;
}
public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessor accessor, List<String> currenttip, Layout layout) {
public List<String> handleBlockTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorBlock accessor, List<String> currenttip, Layout layout) {
Block block = accessor.getBlock();
if (accessor.getTileEntity() != null && Waila.instance.serverPresent &&
((System.currentTimeMillis() - accessor.timeLastUpdate >= 250))){
accessor.timeLastUpdate = System.currentTimeMillis();
WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity()));
}
if (accessor.getTileEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){
accessor.resetTimer();
HashSet<String> keys = new HashSet<String>();
if (ModuleRegistrar.instance().hasSyncedNBTKeys(block))
keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(block));
if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getTileEntity()))
keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getTileEntity()));
if (keys.size() != 0)
PacketDispatcher.sendPacketToServer(Packet0x01TERequest.create(world, mop, keys));
} else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) {
try{
NBTTagCompound tag = new NBTTagCompound();
accessor.getTileEntity().writeToNBT(tag);
accessor.remoteNbt = tag;
} catch (Exception e){
WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
}
}
/* Interface IWailaBlock */
if (IWailaBlock.class.isInstance(block)){
TileEntity entity = world.getTileEntity(mop.blockX, mop.blockY, mop.blockZ);
TileEntity entity = world.getBlockTileEntity(mop.blockX, mop.blockY, mop.blockZ);
if (layout == Layout.HEADER)
try{
return ((IWailaBlock)block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
@@ -82,34 +110,34 @@ public class MetaDataProvider{
}
}
headProviders.clear();
bodyProviders.clear();
tailProviders.clear();
headBlockProviders.clear();
bodyBlockProviders.clear();
tailBlockProviders.clear();
/* Lookup by class (for blocks)*/
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block))
headProviders.addAll(ModuleRegistrar.instance().getHeadProviders(block));
headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(block));
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block))
bodyProviders.addAll(ModuleRegistrar.instance().getBodyProviders(block));
bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(block));
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block))
tailProviders.addAll(ModuleRegistrar.instance().getTailProviders(block));
tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(block));
/* Lookup by class (for tileentities)*/
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity()))
headProviders.addAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity()))
bodyProviders.addAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity()))
tailProviders.addAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
/* Apply all collected providers */
if (layout == Layout.HEADER)
for (IWailaDataProvider dataProvider : headProviders)
for (IWailaDataProvider dataProvider : headBlockProviders)
try{
currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
} catch (Throwable e){
@@ -117,7 +145,7 @@ public class MetaDataProvider{
}
if (layout == Layout.BODY)
for (IWailaDataProvider dataProvider : bodyProviders)
for (IWailaDataProvider dataProvider : bodyBlockProviders)
try{
currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
} catch (Throwable e){
@@ -125,7 +153,7 @@ public class MetaDataProvider{
}
if (layout == Layout.FOOTER)
for (IWailaDataProvider dataProvider : tailProviders)
for (IWailaDataProvider dataProvider : tailBlockProviders)
try{
currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
} catch (Throwable e){
@@ -134,4 +162,69 @@ public class MetaDataProvider{
return currenttip;
}
public List<String> handleEntityTextData(Entity entity, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorEntity accessor, List<String> currenttip, Layout layout) {
if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){
accessor.resetTimer();
HashSet<String> keys = new HashSet<String>();
if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getEntity()))
keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getEntity()));
if (keys.size() != 0)
PacketDispatcher.sendPacketToServer(Packet0x03EntRequest.create(world, accessor.getEntity(), keys));
} else if (accessor.getEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) {
try{
NBTTagCompound tag = new NBTTagCompound();
accessor.getEntity().writeToNBT(tag);
accessor.remoteNbt = tag;
} catch (Exception e){
WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
}
}
headEntityProviders.clear();
bodyEntityProviders.clear();
tailEntityProviders.clear();
/* Lookup by class (for entities)*/
if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadEntityProviders(entity))
headEntityProviders.addAll(ModuleRegistrar.instance().getHeadEntityProviders(entity));
else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity))
bodyEntityProviders.addAll(ModuleRegistrar.instance().getBodyEntityProviders(entity));
else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity))
tailEntityProviders.addAll(ModuleRegistrar.instance().getTailEntityProviders(entity));
/* Apply all collected providers */
if (layout == Layout.HEADER)
for (IWailaEntityProvider dataProvider : headEntityProviders)
try{
currenttip = dataProvider.getWailaHead(entity, currenttip, accessor, ConfigHandler.instance());
} catch (Throwable e){
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
}
if (layout == Layout.BODY)
for (IWailaEntityProvider dataProvider : bodyEntityProviders)
try{
currenttip = dataProvider.getWailaBody(entity, currenttip, accessor, ConfigHandler.instance());
} catch (Throwable e){
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
}
if (layout == Layout.FOOTER)
for (IWailaEntityProvider dataProvider : tailEntityProviders)
try{
currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance());
} catch (Throwable e){
currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
}
return currenttip;
}
}
+315 -100
View File
@@ -5,49 +5,62 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
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.Waila;
import mcp.mobius.waila.api.IWailaBlockDecorator;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.IWailaEntityProvider;
import mcp.mobius.waila.api.IWailaFMPDecorator;
import mcp.mobius.waila.api.IWailaFMPProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
import mcp.mobius.waila.api.IWailaSummaryProvider;
import mcp.mobius.waila.cbcore.LangUtil;
public class ModuleRegistrar implements IWailaRegistrar {
private static ModuleRegistrar instance = null;
//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<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<IWailaBlockDecorator>> blockClassDecorators = new LinkedHashMap<Class, ArrayList<IWailaBlockDecorator>>();
public LinkedHashMap<Class, ArrayList<IWailaBlockDecorator>> blockClassDecorators = new LinkedHashMap<Class, ArrayList<IWailaBlockDecorator>>();
public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> headEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> bodyEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> tailEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> overrideEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> headFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();
public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> bodyFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();
public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> tailFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();
public LinkedHashMap<String, ArrayList<IWailaFMPDecorator>> FMPClassDecorators = new LinkedHashMap<String, ArrayList<IWailaFMPDecorator>>();
public LinkedHashMap<Class, HashSet<String>> syncedNBTKeys = new LinkedHashMap<Class, HashSet<String>>();
public LinkedHashMap<String, LinkedHashMap <String, LinkedHashMap <String, String>>> wikiDescriptions = new LinkedHashMap<String, LinkedHashMap <String, LinkedHashMap <String, String>>>();
public LinkedHashMap<Class, ArrayList<IWailaSummaryProvider>> summaryProviders = new LinkedHashMap<Class, ArrayList<IWailaSummaryProvider>>();
private ModuleRegistrar() {
instance = this;
}
public static ModuleRegistrar instance(){
public static ModuleRegistrar instance(){
if (ModuleRegistrar.instance == null)
ModuleRegistrar.instance = new ModuleRegistrar();
return ModuleRegistrar.instance;
}
/* CONFIG HANDLING */
@Override
public void addConfig(String modname, String key, String configname) {
ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG(configname));
@@ -68,160 +81,334 @@ public class ModuleRegistrar implements IWailaRegistrar {
ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG("option." + key));
}
/* REGISTRATION METHODS */
@Override
@Deprecated
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))
this.headBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
ArrayList<IWailaDataProvider> providers = this.headBlockProviders.get(block);
if (providers.contains(dataProvider)) return;
this.headBlockProviders.get(block).add(dataProvider);
this.registerProvider(dataProvider, block, this.headBlockProviders);
}
@Override
@Deprecated
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))
this.bodyBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
ArrayList<IWailaDataProvider> providers = this.bodyBlockProviders.get(block);
if (providers.contains(dataProvider)) return;
this.bodyBlockProviders.get(block).add(dataProvider);
this.registerProvider(dataProvider, block, this.bodyBlockProviders);
}
@Override
@Deprecated
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))
this.tailBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
ArrayList<IWailaDataProvider> providers = this.tailBlockProviders.get(block);
if (providers.contains(dataProvider)) return;
this.tailBlockProviders.get(block).add(dataProvider);
this.registerProvider(dataProvider, block, this.tailBlockProviders);
}
@Override
@Deprecated
public void registerStackProvider(IWailaDataProvider dataProvider, int blockID) {
this.registerStackProvider(dataProvider, Block.blocksList[blockID].getClass());
}
@Override
public void registerStackProvider(IWailaDataProvider dataProvider, Class block) {
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);
this.registerProvider(dataProvider, block, this.stackBlockProviders);
}
@Override
public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity) {
this.registerProvider(dataProvider, entity, this.headEntityProviders);
}
@Override
public void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity) {
this.registerProvider(dataProvider, entity, this.bodyEntityProviders);
}
@Override
public void registerTailProvider(IWailaEntityProvider dataProvider, Class entity) {
this.registerProvider(dataProvider, entity, this.tailEntityProviders);
}
@Override
public void registerHeadProvider(IWailaFMPProvider dataProvider, String name) {
this.registerProvider(dataProvider, name, this.headFMPProviders);
}
@Override
public void registerBodyProvider(IWailaFMPProvider dataProvider, String name) {
this.registerProvider(dataProvider, name, this.bodyFMPProviders);
}
@Override
public void registerTailProvider(IWailaFMPProvider dataProvider, String name) {
this.registerProvider(dataProvider, name, this.tailFMPProviders);
}
@Override
public void registerOverrideEntityProvider (IWailaEntityProvider dataProvider, Class entity){
this.registerProvider(dataProvider, entity, this.overrideEntityProviders);
}
@Override
public void registerShortDataProvider(IWailaSummaryProvider dataProvider, Class item) {
if (!this.summaryProviders.containsKey(item))
this.summaryProviders.put(item, new ArrayList<IWailaSummaryProvider>());
this.summaryProviders.get(item).add(dataProvider);
this.registerProvider(dataProvider, item, this.summaryProviders);
}
@Override
public void registerBlockDecorator(IWailaBlockDecorator decorator, Class block) {
if (!this.blockClassDecorators.containsKey(block))
this.blockClassDecorators.put(block, new ArrayList<IWailaBlockDecorator>());
this.blockClassDecorators.get(block).add(decorator);
}
@Deprecated
public void registerDecorator(IWailaBlockDecorator decorator, int blockID) {
this.registerDecorator(decorator, Block.blocksList[blockID].getClass());
}
@Override
public void registerDecorator(IWailaBlockDecorator decorator, Class block) {
this.registerProvider(decorator, block, this.blockClassDecorators);
}
@Override
public void registerDecorator(IWailaFMPDecorator decorator, String name) {
this.registerProvider(decorator, name, this.FMPClassDecorators);
}
private <T, V> void registerProvider(T dataProvider, V clazz, LinkedHashMap<V, ArrayList<T>> target) {
if (!target.containsKey(clazz))
target.put(clazz, new ArrayList<T>());
ArrayList<T> providers =target.get(clazz);
if (providers.contains(dataProvider)) return;
target.get(clazz).add(dataProvider);
}
@Override
public void registerSyncedNBTKey(String key, Class target){
if (!this.syncedNBTKeys.containsKey(target))
this.syncedNBTKeys.put(target, new HashSet<String>());
this.syncedNBTKeys.get(target).add(key);
}
/* PROVIDER GETTERS */
public ArrayList<IWailaDataProvider> getHeadProviders(Object block) {
ArrayList<IWailaDataProvider> returnList = new ArrayList<IWailaDataProvider>();
for (Class clazz : this.headBlockProviders.keySet())
if (clazz.isInstance(block))
returnList.addAll(this.headBlockProviders.get(clazz));
return returnList;
return getProviders(block, this.headBlockProviders);
}
public ArrayList<IWailaDataProvider> getBodyProviders(Object block) {
ArrayList<IWailaDataProvider> returnList = new ArrayList<IWailaDataProvider>();
for (Class clazz : this.bodyBlockProviders.keySet())
if (clazz.isInstance(block))
returnList.addAll(this.bodyBlockProviders.get(clazz));
return returnList;
return getProviders(block, this.bodyBlockProviders);
}
public ArrayList<IWailaDataProvider> getTailProviders(Object block) {
ArrayList<IWailaDataProvider> returnList = new ArrayList<IWailaDataProvider>();
for (Class clazz : this.tailBlockProviders.keySet())
if (clazz.isInstance(block))
returnList.addAll(this.tailBlockProviders.get(clazz));
return returnList;
return getProviders(block, this.tailBlockProviders);
}
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;
return getProviders(block, this.stackBlockProviders);
}
public ArrayList<IWailaEntityProvider> getHeadEntityProviders(Object entity) {
return getProviders(entity, this.headEntityProviders);
}
public ArrayList<IWailaEntityProvider> getBodyEntityProviders(Object entity) {
return getProviders(entity, this.bodyEntityProviders);
}
public ArrayList<IWailaEntityProvider> getTailEntityProviders(Object entity) {
return getProviders(entity, this.tailEntityProviders);
}
public ArrayList<IWailaEntityProvider> getOverrideEntityProviders(Object entity) {
return getProviders(entity, this.overrideEntityProviders);
}
public ArrayList<IWailaFMPProvider> getHeadFMPProviders(String name) {
return getProviders(name, this.headFMPProviders);
}
public ArrayList<IWailaFMPProvider> getBodyFMPProviders(String name) {
return getProviders(name, this.bodyFMPProviders);
}
public ArrayList<IWailaFMPProvider> getTailFMPProviders(String name) {
return getProviders(name, this.tailFMPProviders);
}
public ArrayList<IWailaSummaryProvider> getSummaryProvider(Object item){
ArrayList<IWailaSummaryProvider> returnList = new ArrayList<IWailaSummaryProvider>();
for (Class clazz : this.summaryProviders.keySet())
if (clazz.isInstance(item))
returnList.addAll(this.summaryProviders.get(clazz));
return returnList;
return getProviders(item, this.summaryProviders);
}
public ArrayList<IWailaBlockDecorator> getBlockDecorators(Object block){
ArrayList<IWailaBlockDecorator> returnList = new ArrayList<IWailaBlockDecorator>();
for (Class clazz : this.blockClassDecorators.keySet())
if (clazz.isInstance(block))
returnList.addAll(this.blockClassDecorators.get(clazz));
return getProviders(block, this.blockClassDecorators);
}
public ArrayList<IWailaFMPDecorator> getFMPDecorators(String name){
return getProviders(name, this.FMPClassDecorators);
}
private <T> ArrayList<T> getProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target){
ArrayList<T> returnList = new ArrayList<T>();
for (Class clazz : target.keySet())
if (clazz.isInstance(obj))
returnList.addAll(target.get(clazz));
return returnList;
}
private <T> ArrayList<T> getProviders(String name, LinkedHashMap<String, ArrayList<T>> target){
return target.get(name);
}
public HashSet<String> getSyncedNBTKeys(Object target){
HashSet<String> returnList = new HashSet<String>();
for (Class clazz : this.syncedNBTKeys.keySet())
if (clazz.isInstance(target))
returnList.addAll(this.syncedNBTKeys.get(clazz));
return returnList;
}
/* HAS METHODS */
public boolean hasStackProviders(Object block){
for (Class clazz : this.stackBlockProviders.keySet())
if (clazz.isInstance(block))
return true;
return false;
return hasProviders(block, this.stackBlockProviders);
}
public boolean hasHeadProviders(Object block){
for (Class clazz : this.headBlockProviders.keySet())
if (clazz.isInstance(block))
return true;
return false;
return hasProviders(block, this.headBlockProviders);
}
public boolean hasBodyProviders(Object block){
for (Class clazz : this.bodyBlockProviders.keySet())
if (clazz.isInstance(block))
return true;
return false;
return hasProviders(block, this.bodyBlockProviders);
}
public boolean hasTailProviders(Object block){
for (Class clazz : this.tailBlockProviders.keySet())
if (clazz.isInstance(block))
return true;
return false;
return hasProviders(block, this.tailBlockProviders);
}
public boolean hasHeadEntityProviders(Object entity){
return hasProviders(entity, this.headEntityProviders);
}
public boolean hasBodyEntityProviders(Object entity){
return hasProviders(entity, this.bodyEntityProviders);
}
public boolean hasTailEntityProviders(Object entity){
return hasProviders(entity, this.tailEntityProviders);
}
public boolean hasOverrideEntityProviders(Object entity){
return hasProviders(entity, this.overrideEntityProviders);
}
public boolean hasHeadFMPProviders(String name){
return hasProviders(name, this.headFMPProviders);
}
public boolean hasBodyFMPProviders(String name){
return hasProviders(name, this.bodyFMPProviders);
}
public boolean hasTailFMPProviders(String name){
return hasProviders(name, this.tailFMPProviders);
}
public boolean hasBlockDecorator(Object block){
return hasProviders(block, this.blockClassDecorators);
}
public boolean hasFMPDecorator(String name){
return hasProviders(name, this.FMPClassDecorators);
}
private <T> boolean hasProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target){
for (Class clazz : target.keySet())
if (clazz.isInstance(obj))
return true;
return false;
}
private <T> boolean hasProviders(String name, LinkedHashMap<String, ArrayList<T>> target){
return target.containsKey(name);
}
public boolean hasSummaryProvider(Class item){
return this.summaryProviders.containsKey(item);
}
public boolean hasBlockDecorator(Object block){
for (Class clazz : this.blockClassDecorators.keySet())
if (clazz.isInstance(block))
public boolean hasSyncedNBTKeys(Object target){
for (Class clazz : this.syncedNBTKeys.keySet())
if (clazz.isInstance(target))
return true;
return false;
}
}
/* ----------------- */
@Override
public void registerDocTextFile(String filename) {
List<String[]> docData = null;
int nentries = 0;
try{
docData = this.readFileAsString(filename);
} catch (IOException e){
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);
}
}
}
*/
Waila.log.log(Level.INFO, String.format("Registered %s entries from %s", nentries, filename));
}
public boolean hasDocTextModID(String modid){
@@ -267,4 +454,32 @@ 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();
*/
}
}
+3
View File
@@ -0,0 +1,3 @@
@API(apiVersion="1.0",owner="Waila",provides="WailaAPI")
package mcp.mobius.waila.api;
import cpw.mods.fml.common.API;
-237
View File
@@ -1,237 +0,0 @@
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
@@ -1,90 +0,0 @@
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
@@ -1,110 +0,0 @@
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;
}
}
+50 -35
View File
@@ -3,33 +3,42 @@ package mcp.mobius.waila.client;
import java.util.EnumSet;
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 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 mcp.mobius.waila.gui.screens.info.ScreenEnchants;
import mcp.mobius.waila.handlers.nei.HandlerEnchants;
import mcp.mobius.waila.overlay.RayTracing;
import mcp.mobius.waila.utils.Constants;
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 net.minecraftforge.common.Configuration;
import org.lwjgl.input.Keyboard;
public class ConfigKeyHandler {
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;
public class ConfigKeyHandler extends KeyHandler {
static boolean firstInventory = true;
/*
public ConfigKeyHandler()
{
super(new KeyBinding[]{
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_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_TESTING, Keyboard.KEY_NUMPAD9),
}, new boolean[]{
false,
@@ -40,14 +49,23 @@ public class ConfigKeyHandler {
//false
});
//GuiContainerManager.addInputHandler(new HandlerEnchants());
//API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I);
/*
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);
}
*/
/*
@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){
@@ -63,18 +81,18 @@ public class ConfigKeyHandler {
if (mc.currentScreen != null)
return;
if (kb.keyDescription == Constants.BIND_WAILA_SHOW && ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
boolean status = ConfigHandler.instance().getConfig(Constants.CFG_WAILA_SHOW);
ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, !status);
if (kb.keyDescription == Constants.BIND_WAILA_SHOW && ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, true)){
boolean status = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, !status);
}
else if (kb.keyDescription == Constants.BIND_WAILA_SHOW && !ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, true);
else if (kb.keyDescription == Constants.BIND_WAILA_SHOW && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, true)){
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
}
else if (kb.keyDescription == Constants.BIND_WAILA_LIQUID){
boolean status = ConfigHandler.instance().getConfig(Constants.CFG_WAILA_LIQUID);
ConfigHandler.instance().setConfig(Constants.CFG_WAILA_LIQUID, !status);
boolean status = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true);
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, !status);
}
else if (kb.keyDescription == Constants.BIND_WAILA_RECIPE){
@@ -84,11 +102,11 @@ public class ConfigKeyHandler {
else if (kb.keyDescription == Constants.BIND_WAILA_USAGE){
this.openRecipeGUI(false);
}
}
*/
public void openRecipeGUI(boolean recipe){
/*
Minecraft mc = Minecraft.getMinecraft();
boolean uiResult;
String msg;
@@ -125,15 +143,13 @@ public class ConfigKeyHandler {
}
}
}
*/
}
/*
@Override
public void keyUp(EnumSet<TickType> types, KeyBinding kb, boolean tickEnd) {
if (!tickEnd) return;
if (kb.keyDescription == Constants.BIND_WAILA_SHOW && !ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, false);
if (kb.keyDescription == Constants.BIND_WAILA_SHOW && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, true)){
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false);
}
}
@@ -145,7 +161,6 @@ public class ConfigKeyHandler {
@Override
public String getLabel() {
return "Waila Config Screen Keybind";
}
*/
}
}
+83 -47
View File
@@ -1,46 +1,55 @@
package mcp.mobius.waila.client;
import mcp.mobius.waila.Constants;
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.agriculture.AgricultureModule;
import mcp.mobius.waila.addons.appeng.AppEngModule;
import mcp.mobius.waila.addons.buildcraft.BCModule;
import mcp.mobius.waila.addons.buildcraft.BCPowerAPIModule;
import mcp.mobius.waila.addons.carpenters.CarpentersModule;
import mcp.mobius.waila.addons.enderio.EnderIOModule;
import mcp.mobius.waila.addons.enderstorage.EnderStorageModule;
import mcp.mobius.waila.addons.etb.ETBModule;
import mcp.mobius.waila.addons.exu.ExtraUtilitiesModule;
import mcp.mobius.waila.addons.gravestone.GravestoneModule;
import mcp.mobius.waila.addons.harvestcraft.HarvestcraftModule;
import mcp.mobius.waila.addons.ic2.IC2Module;
import mcp.mobius.waila.addons.magicalcrops.MagicalCropsModule;
import mcp.mobius.waila.addons.openblocks.OpenBlocksModule;
import mcp.mobius.waila.addons.projectred.ProjectRedModule;
import mcp.mobius.waila.addons.railcraft.RailcraftModule;
import mcp.mobius.waila.addons.secretrooms.SecretRoomsModule;
import mcp.mobius.waila.addons.statues.StatuesModule;
import mcp.mobius.waila.addons.stevescarts.StevesCartsModule;
import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule;
import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule;
import mcp.mobius.waila.addons.twilightforest.TwilightForestModule;
import mcp.mobius.waila.addons.vanillamc.HUDHandlerVanilla;
import mcp.mobius.waila.api.impl.MetaDataProvider;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import mcp.mobius.waila.gui.truetyper.FontLoader;
import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
import mcp.mobius.waila.handlers.HUDHandlerWaila;
import mcp.mobius.waila.handlers.DecoratorFMP;
import mcp.mobius.waila.handlers.HUDHandlerBlocks;
import mcp.mobius.waila.handlers.HUDHandlerEntities;
import mcp.mobius.waila.handlers.HUDHandlerFMP;
import mcp.mobius.waila.handlers.SummaryProviderDefault;
//import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila;
import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila;
import mcp.mobius.waila.overlay.WailaTickHandler;
import mcp.mobius.waila.server.ProxyServer;
import mcp.mobius.waila.utils.Constants;
import net.minecraft.block.Block;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.input.Keyboard;
//import cpw.mods.fml.client.registry.KeyBindingRegistry;
//import cpw.mods.fml.common.registry.TickRegistry;
import codechicken.lib.lang.LangUtil;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.forge.GuiContainerManager;
import cpw.mods.fml.client.registry.KeyBindingRegistry;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
public class ProxyClient extends ProxyServer {
@@ -49,42 +58,40 @@ 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");
LangUtil.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);
//API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.FOOTER);
//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 HUDHandlerBlocks(), Block.class);
ModuleRegistrar.instance().registerTailProvider(new HUDHandlerBlocks(), Block.class);
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerEntities(), Entity.class);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEntities(), Entity.class);
ModuleRegistrar.instance().registerTailProvider(new HUDHandlerEntities(), Entity.class);
ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerWaila(), Block.class);
ModuleRegistrar.instance().registerTailProvider(new HUDHandlerWaila(), Block.class);
ModuleRegistrar.instance().registerShortDataProvider(new SummaryProviderDefault(), Item.class);
ModuleRegistrar.instance().addConfig("General", "general.showhp");
ModuleRegistrar.instance().addConfig("General", "general.showcrop");
}
@Override
@@ -96,49 +103,78 @@ 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();
/* Steve's Carts */
StevesCartsModule.register();
/* Secret Rooms */
SecretRoomsModule.register();
/* Carpenter's Blocks */
CarpentersModule.register();
/* Pam's HarvestCraft */
HarvestcraftModule.register();
/* Magical crops */
MagicalCropsModule.register();
/* Statues */
StatuesModule.register();
/* Agriculture */
AgricultureModule.register();
if(Loader.isModLoaded("ForgeMultipart")){
HUDHandlerFMP.register();
DecoratorFMP.register();
}
//ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBlocks(), Block.class);
//ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBlocks(), TileEntity.class);
}
@Override
-60
View File
@@ -1,60 +0,0 @@
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);
}
}
@@ -1,14 +0,0 @@
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
@@ -1,84 +0,0 @@
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);
}
}
}
}
}
+44 -13
View File
@@ -59,6 +59,45 @@ public class UIHelper {
GL11.glEnable(GL11.GL_TEXTURE_2D);
}
public static void drawBillboard(Vec3 pos, float offX, float offY, float offZ, double x1, double y1, double x2, double y2, int r, int g, int b, int a, double partialFrame){
UIHelper.drawBillboard((float)pos.xCoord, (float)pos.yCoord, (float)pos.zCoord, offX, offY, offZ, x1, y1, x2, y2, r, g, b, a, partialFrame);
}
public static void drawBillboard(float posX, float posY, float posZ, float offX, float offY, float offZ, double x1, double y1, double x2, double y2, int r, int g, int b, int a, double partialFrame){
EntityLivingBase player = Minecraft.getMinecraft().renderViewEntity;
float playerViewY = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * (float)partialFrame;
float playerViewX = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * (float)partialFrame;
UIHelper.drawBillboard(posX, posY, posZ, offX, offY, offZ, playerViewX, playerViewY * -1.0F, 0.0F, x1, y1, x2, y2, r, g, b, a);
}
public static void drawBillboard(float posX, float posY, float posZ, float offX, float offY, float offZ, float rotX, float rotY, float rotZ, double x1, double y1, double x2, double y2, int r, int g, int b, int a){
float f = 1.6F;
float f1 = 0.016666668F * f;
GL11.glPushMatrix();
GL11.glTranslatef(posX + offX, posY + offY, posZ + offZ);
GL11.glNormal3f(0.0F, 1.0F, 0.0F);
GL11.glRotatef(rotY, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(rotX, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(rotZ, 0.0F, 0.0F, 1.0F);
//GL11.glScalef(-f1, -f1, f1);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDepthMask(false);
GL11.glDisable(GL11.GL_DEPTH_TEST);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
//GL11.glDisable(GL11.GL_TEXTURE_2D);
drawRectangle(x1, y1, 0, x2, y2, 0, r, g, b, a);
GL11.glPopMatrix();
}
public static void drawBillboardText(String text, Vec3 pos, float offX, float offY, float offZ, double partialFrame){
UIHelper.drawBillboardText(text, (float)pos.xCoord, (float)pos.yCoord, (float)pos.zCoord, offX, offY, offZ, partialFrame);
}
@@ -104,17 +143,9 @@ public class UIHelper {
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
byte b0 = 0;
Tessellator tessellator = Tessellator.instance;
GL11.glDisable(GL11.GL_TEXTURE_2D);
tessellator.startDrawingQuads();
int j = fontrenderer.getStringWidth(text) / 2;
tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F);
tessellator.addVertex((double)(-j - 1), (double)(-1 + b0), 0.0D);
tessellator.addVertex((double)(-j - 1), (double)(8 + b0), 0.0D);
tessellator.addVertex((double)(j + 1), (double)(8 + b0), 0.0D);
tessellator.addVertex((double)(j + 1), (double)(-1 + b0), 0.0D);
tessellator.draw();
drawRectangle((double)(-j - 1), (double)(8 + b0), 0.0, (double)(j + 1), (double)(-1 + b0), 0.0, 0, 0, 0, 64);
GL11.glEnable(GL11.GL_TEXTURE_2D);
fontrenderer.drawString(text, -fontrenderer.getStringWidth(text) / 2, b0, 553648127);
@@ -132,9 +163,9 @@ public class UIHelper {
public static void drawRectangle(double x1, double y1, double z1, double x2, double y2, double z2, int r, int g, int b, int a){
Tessellator tessellator = Tessellator.instance;
tessellator.setColorRGBA(r, g, b, a);
tessellator.startDrawingQuads();
tessellator.setColorRGBA(r, g, b, a);
tessellator.addVertex(x1, y2, z1);
tessellator.addVertex(x1, y1, z2);
tessellator.addVertex(x2, y1, z2);
@@ -147,9 +178,9 @@ public class UIHelper {
public static void drawRectangleEW(double x1, double y1, double z1, double x2, double y2, double z2, int r, int g, int b, int a){
Tessellator tessellator = Tessellator.instance;
tessellator.setColorRGBA(r, g, b, a);
tessellator.startDrawingQuads();
tessellator.setColorRGBA(r, g, b, a);
tessellator.addVertex(x1, y1, z1);
tessellator.addVertex(x1, y1, z2);
tessellator.addVertex(x2, y2, z2);
@@ -1,6 +1,5 @@
package mcp.mobius.waila.gui.screens.config;
import mcp.mobius.waila.Constants;
import mcp.mobius.waila.gui.interfaces.CType;
import mcp.mobius.waila.gui.interfaces.WAlign;
import mcp.mobius.waila.gui.screens.ScreenBase;
@@ -10,6 +9,7 @@ import mcp.mobius.waila.gui.widgets.buttons.ButtonBooleanConfig;
import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer;
import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel;
import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange;
import mcp.mobius.waila.utils.Constants;
import net.minecraft.client.gui.GuiScreen;
public class ScreenConfig extends ScreenBase {
@@ -2,7 +2,6 @@ package mcp.mobius.waila.gui.screens.config;
import org.lwjgl.util.Point;
import mcp.mobius.waila.Constants;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.gui.events.MouseEvent;
@@ -19,7 +18,10 @@ import mcp.mobius.waila.gui.widgets.WidgetGeometry;
import mcp.mobius.waila.gui.widgets.buttons.ButtonLabel;
import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange;
import mcp.mobius.waila.gui.widgets.movable.PictureMovableRC;
import mcp.mobius.waila.overlay.OverlayConfig;
import mcp.mobius.waila.utils.Constants;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.common.Configuration;
public class ScreenHUDConfig extends ScreenBase {
@@ -48,10 +50,10 @@ public class ScreenHUDConfig extends ScreenBase {
layoutY.addWidget("ValueDisplayY", new LabelFixedFont(null, "0")).setGeometry(new WidgetGeometry(50.0,50.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER));
*/
double picX = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSX) / 100.0;
double picY = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSY) / 100.0;
float picAlpha = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_ALPHA) / 100.0f;
scale = ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_SCALE) / 100.0f;
double picX = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX,0) / 100.0;
double picY = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY,0) / 100.0;
float picAlpha = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA,0) / 100.0f;
scale = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE,0) / 100.0f;
int picSX = (int)(180 / this.rez.getScaleFactor() * scale), picSY = (int)(62 / this.rez.getScaleFactor() * scale);
this.addWidget("Layout", new LayoutMargin(null), RenderPriority.HIGH);
@@ -219,17 +221,17 @@ public class ScreenHUDConfig extends ScreenBase {
}
if (srcwidget.equals(this.getWidget("ButtonOk")) && signal == Signal.CLICKED){
ConfigHandler.instance().setConfigInt(Constants.CFG_WAILA_POSX, (int)(this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getX() * 100.0));
ConfigHandler.instance().setConfigInt(Constants.CFG_WAILA_POSY, (int)(this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getY() * 100.0));
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));
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, (int)(this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getX() * 100.0));
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, (int)(this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getY() * 100.0));
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, (int)(this.getWidget("Layout").getWidget("Picture").getAlpha() * 100.0));
ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE, (int)(scale * 100.0));
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;
OverlayConfig.alpha = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA,0);
OverlayConfig.posX = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 0);
OverlayConfig.posY = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 0);
OverlayConfig.scale = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE,0) / 100.0f;
Waila.updateColors();
OverlayConfig.updateColors();
}
if (srcwidget.equals(this.getWidget("ButtonDefault")) && signal == Signal.CLICKED){
@@ -11,6 +11,7 @@ import mcp.mobius.waila.gui.widgets.buttons.ButtonBooleanConfigRemote;
import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer;
import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel;
import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange;
import mcp.mobius.waila.utils.Constants;
import net.minecraft.client.gui.GuiScreen;
public class ScreenModuleConfig extends ScreenBase {
@@ -29,9 +30,9 @@ public class ScreenModuleConfig extends ScreenBase {
for (String key:ConfigHandler.instance().getConfigKeys(this.modName).keySet()){
if (ConfigHandler.instance().isServerRequired(key))
buttonContainer.addButton(new ButtonBooleanConfigRemote(this.getRoot(), key, "screen.button.no", "screen.button.yes"), ConfigHandler.instance().getConfigKeys(this.modName).get(key));
buttonContainer.addButton(new ButtonBooleanConfigRemote(this.getRoot(), Constants.CATEGORY_MODULES, key, "screen.button.no", "screen.button.yes"), ConfigHandler.instance().getConfigKeys(this.modName).get(key));
else
buttonContainer.addButton(new ButtonBooleanConfig(this.getRoot(), key, "screen.button.no", "screen.button.yes"), ConfigHandler.instance().getConfigKeys(this.modName).get(key));
buttonContainer.addButton(new ButtonBooleanConfig(this.getRoot(), Constants.CATEGORY_MODULES, key, "screen.button.no", "screen.button.yes"), ConfigHandler.instance().getConfigKeys(this.modName).get(key));
//buttonContainer.addButton(new ButtonConfigRemote(-1, "No", "Yes", ConfigHandler.instance().getConfigKeys(this.modName).get(key), key ));
//else
//buttonContainer.addButton(new ButtonConfigOption(-1, "No", "Yes", ConfigHandler.instance().getConfigKeys(this.modName).get(key), key ));
@@ -1,7 +1,7 @@
package mcp.mobius.waila.gui.screens.config;
import net.minecraft.client.gui.GuiScreen;
import mcp.mobius.waila.Constants;
import net.minecraftforge.common.Configuration;
import mcp.mobius.waila.gui.interfaces.CType;
import mcp.mobius.waila.gui.interfaces.WAlign;
import mcp.mobius.waila.gui.screens.ScreenBase;
@@ -11,6 +11,7 @@ import mcp.mobius.waila.gui.widgets.buttons.ButtonBooleanConfig;
import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel;
import mcp.mobius.waila.gui.widgets.buttons.ButtonIntegerConfig;
import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange;
import mcp.mobius.waila.utils.Constants;
public class ScreenWailaConfig extends ScreenBase {
public ScreenWailaConfig(GuiScreen parent){
@@ -21,10 +22,12 @@ public class ScreenWailaConfig extends ScreenBase {
ButtonContainerLabel buttonContainer = ((ButtonContainerLabel)this.getRoot().getWidget("ButtonContainer"));
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Constants.CFG_WAILA_SHOW, true, true, "screen.button.hidden", "screen.button.visible"), "choice.showhidewaila");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Constants.CFG_WAILA_MODE, true, true, "screen.button.maintained", "screen.button.toggled"), "choice.toggledmaintained");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Constants.CFG_WAILA_METADATA, true, false,"screen.button.hidden", "screen.button.visible"), "choice.showhideidmeta");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Constants.CFG_WAILA_LIQUID, true, false,"screen.button.hidden", "screen.button.visible"), "choice.showliquids");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true, true, "screen.button.hidden", "screen.button.visible"), "choice.showhidewaila");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, true, true, "screen.button.maintained", "screen.button.toggled"), "choice.toggledmaintained");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true, false,"screen.button.hidden", "screen.button.visible"), "choice.showhideidmeta");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true, false,"screen.button.hidden", "screen.button.visible"), "choice.showliquids");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, true, false,"screen.button.no", "screen.button.yes"), "choice.shifttoggledblock");
buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTENTS, true, false,"screen.button.no", "screen.button.yes"), "choice.shifttoggledents");
this.getRoot().addWidget("LayoutConfigPos", new LayoutBase(this.getRoot()));
@@ -1,6 +1,5 @@
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;
@@ -8,6 +7,8 @@ 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;
@@ -41,7 +42,7 @@ public class ItemStackDisplay extends WidgetBase {
GL11.glScalef(scaleX, scaleY, 1.0f);
RenderHelper.enableGUIStandardItemLighting();
ItemRenderer.drawItem((int)(pos.getX()/scaleX), (int)(pos.getY()/scaleX), this.stack);
GuiContainerManager.drawItem((int)(pos.getX()/scaleX), (int)(pos.getY()/scaleX), this.stack);
GL11.glPopMatrix();
}
@@ -1,6 +1,5 @@
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;
@@ -9,6 +8,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.util.Point;
import codechicken.lib.lang.LangUtil;
public class LabelFixedFont extends WidgetBase {
protected String text = "";
@@ -6,7 +6,6 @@ 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;
@@ -67,7 +66,7 @@ public abstract class ButtonBase extends WidgetBase {
@Override
public void onMouseClick(MouseEvent event){
if (event.button == 0)
this.mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
this.mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
this.emit(Signal.CLICKED, event.button);
}
Loaded 100 of 133 files, more files were not shown because too many files have changed in this diff. Show more