Extend IC2 Module

src/main/java/mcp/mobius/waila/addons/core/BaseModule.java

@@ -0,0 +1,59 @@
+package mcp.mobius.waila.addons.core;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+public class BaseModule {
+
+    protected static final Map<String, Class<?>> classes = new HashMap<>();
+    protected static final Map<String, Field> fields = new HashMap<>();
+    protected static final Map<String, Method> methods = new HashMap<>();
+
+    protected void registerClass(String className) throws Exception {
+        if (classes.containsKey(className)) return;
+        Class<?> clazz = Class.forName(className);
+        classes.put(clazz.getSimpleName(), clazz);
+    }
+
+    protected void registerField(String className, String fieldName) throws Exception {
+        if (fields.containsKey(className + "." + fieldName)) return;
+        Class<?> clazz = classes.get(className);
+        Field field = clazz.getField(fieldName);
+        fields.put(clazz.getSimpleName() + "." + fieldName, field);
+    }
+
+    protected void registerMethod(String className, String methodName, Class<?>... parameterTypes) throws Exception {
+        if (methods.containsKey(className + "." + methodName)) return;
+        Class<?> clazz = classes.get(className);
+        Method method = clazz.getMethod(methodName, parameterTypes);
+        methods.put(clazz.getSimpleName() + "." + methodName, method);
+    }
+
+    public static Object invokeMethod(String methodKey, Object instance, Object... args) throws Exception {
+        Method method = methods.get(methodKey);
+        if (method == null) {
+            throw new IllegalArgumentException("Method " + methodKey + " is not registered.");
+        }
+
+        return method.invoke(instance, args);
+    }
+
+    public static Object getField(String fieldKey, Object instance) throws Exception {
+        Field field = fields.get(fieldKey);
+        if (field == null) {
+            throw new IllegalArgumentException("Field " + fieldKey + " is not registered.");
+        }
+
+        return field.get(instance);
+    }
+
+    public static Class<?> getClass(String className) {
+        Class<?> clazz = classes.get(className);
+        if (clazz == null) {
+            throw new IllegalArgumentException("Class " + className + " is not registered.");
+        }
+        return clazz;
+    }
+}

src/main/java/mcp/mobius/waila/addons/core/HUDHandlerBlocks.java

@@ -36,6 +36,7 @@ public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, I
         String displayName = DisplayUtil.itemDisplayNameShort(itemStack);
         if (displayName != null && !displayName.endsWith("Unnamed"))
             name = displayName;
+
         if (name != null)
             currenttip.add(name);
 
@@ -46,10 +47,10 @@ public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, I
                 redstoneMeta = " " + redstoneMeta;
             currenttip.set(currenttip.size() - 1, name + " " + redstoneMeta);
         }
-        if (currenttip.size() == 0)
-            currenttip.add("\u00a7r" + String.format(FormattingConfig.blockFormat, "< Unnamed >"));
-        else if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true) && !Strings.isNullOrEmpty(FormattingConfig.metaFormat))
-            currenttip.add("\u00a7r" + String.format(FormattingConfig.metaFormat, accessor.getBlock().getRegistryName().toString(), accessor.getMetadata()));
+
+        String modName = ModIdentification.nameFromStack(itemStack);
+        if (!Strings.isNullOrEmpty(FormattingConfig.modNameFormat))
+            currenttip.add(String.format(FormattingConfig.modNameFormat, modName));
 
         return currenttip;
     }
@@ -74,9 +75,12 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> tooltip, IWai
     public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
         if (accessor.getBlockState().getMaterial().isLiquid())
             return currenttip;
-        String modName = ModIdentification.nameFromStack(itemStack);
-        if (!Strings.isNullOrEmpty(FormattingConfig.modNameFormat))
-            currenttip.add(String.format(FormattingConfig.modNameFormat, modName));
+
+        String displayName = DisplayUtil.itemDisplayNameShort(itemStack);
+        if (displayName == null || displayName.endsWith("Unnamed"))
+            currenttip.add("§r" + String.format(FormattingConfig.blockFormat, "< Unnamed >"));
+        else if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true) && !Strings.isNullOrEmpty(FormattingConfig.metaFormat))
+            currenttip.add("§r" + String.format(FormattingConfig.metaFormat, accessor.getBlock().getRegistryName().toString(), accessor.getMetadata()));
 
         return currenttip;
     }

src/main/java/mcp/mobius/waila/addons/core/HUDHandlerEntities.java

@@ -36,6 +36,9 @@ public List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaE
             }
         } else currenttip.add("Unknown");
 
+        if (!Strings.isNullOrEmpty(FormattingConfig.modNameFormat) && !Strings.isNullOrEmpty(getEntityMod(entity)))
+            currenttip.add(String.format(FormattingConfig.modNameFormat, getEntityMod(entity)));
+
         return currenttip;
     }
 
@@ -59,8 +62,6 @@ public List<String> getWailaBody(Entity entity, List<String> currenttip, IWailaE
     @Nonnull
     @Override
     public List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
-        if (!Strings.isNullOrEmpty(FormattingConfig.modNameFormat) && !Strings.isNullOrEmpty(getEntityMod(entity)))
-            currenttip.add(String.format(FormattingConfig.modNameFormat, getEntityMod(entity)));
 
         return currenttip;
     }
@@ -73,4 +74,4 @@ private static String getEntityMod(Entity entity) {
         ModContainer container = ModIdentification.findModContainer(entityEntry.getRegistryName().getResourceDomain());
         return container.getName();
     }
-}
+}

src/main/java/mcp/mobius/waila/addons/core/HUDHandlerFluids.java

@@ -45,12 +45,11 @@ public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, I
             name = displayName;
 
         if (name != null)
-            currenttip.add("\u00a7r" + name);
+            currenttip.add("§r" + name);
 
-        if (currenttip.isEmpty())
-            currenttip.add("\u00a7r" + String.format(FormattingConfig.fluidFormat, "< Unnamed >"));
-        else if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true) && !Strings.isNullOrEmpty(FormattingConfig.metaFormat))
-            currenttip.add(String.format(FormattingConfig.metaFormat, accessor.getBlock().getRegistryName().toString(), accessor.getMetadata()));
+        String modName = ModIdentification.findModContainer(FluidRegistry.getDefaultFluidName(fluid).split(":")[0]).getName();
+        if (!Strings.isNullOrEmpty(FormattingConfig.modNameFormat) && !Strings.isNullOrEmpty(modName))
+            currenttip.add(String.format(FormattingConfig.modNameFormat, modName));
 
         return currenttip;
     }
@@ -62,9 +61,12 @@ public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, I
         if (fluid == null)
             return currenttip;
 
-        String modName = ModIdentification.findModContainer(FluidRegistry.getDefaultFluidName(fluid).split(":")[0]).getName();
-        if (!Strings.isNullOrEmpty(FormattingConfig.modNameFormat) && !Strings.isNullOrEmpty(modName))
-            currenttip.add(String.format(FormattingConfig.modNameFormat, modName));
+        String displayName = String.format(FormattingConfig.fluidFormat, fluid.getLocalizedName(new FluidStack(fluid, 1000)));
+
+        if (displayName == null || displayName.endsWith("Unnamed"))
+            currenttip.add("§r" + String.format(FormattingConfig.fluidFormat, "< Unnamed >"));
+        else if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true) && !Strings.isNullOrEmpty(FormattingConfig.metaFormat))
+            currenttip.add(String.format(FormattingConfig.metaFormat, accessor.getBlock().getRegistryName().toString(), accessor.getMetadata()));
 
         return currenttip;
     }