Added skeleton for a coremod (inactivated for now), just in case.

Added one param to getNBTData (the player). This would invalidate the previous mods, but tricked Waila into using reflection when that happens.
Skeleton Thaumcraft module.
This commit is contained in:
Thomas Guimbretiere committed 2014-12-17 01:15:29 +01:00
1 parent c618a10e7c
commit 5978494340
40 files changed
+529 -155

No files matched your search

@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.agriculture;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -43,7 +44,7 @@ public class HUDHandlerCrop implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
return tag;
}
@@ -6,6 +6,7 @@ import java.util.List;
import org.apache.logging.log4j.Level;
import mcp.mobius.waila.Waila;
@@ -13,6 +14,7 @@ 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 net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -74,7 +76,7 @@ public class HUDHandlerBCTanks implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
return tag;
}
@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.carpenters;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -56,7 +57,7 @@ public class HUDCarpentersBlocksTE implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.enderio;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -66,7 +67,7 @@ public class HUDHandlerCapacitor implements IWailaDataProvider{
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.enderio;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -69,7 +70,7 @@ public class HUDHandlerTesseract implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.enderstorage;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -74,7 +75,7 @@ public class HUDHandlerStorage implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.etb;
import java.util.Arrays;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -105,7 +106,7 @@ public class HUDHandlerSocket implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.exu;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -53,7 +54,7 @@ public class HUDHandlerDrum implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.gravestone;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -33,7 +34,7 @@ public class HUDHandlerGravestone implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.harvestcraft;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -45,7 +46,7 @@ public class HUDHandlerPamCrop implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.ic2;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -60,7 +61,7 @@ public class HUDHandlerTEGenerator implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try{
double storage = -1;
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.magicalcrops;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -43,7 +44,7 @@ public class HUDHandlerMagicalCrops implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.openblocks;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -70,7 +71,7 @@ public class HUDHandlerTank implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -75,7 +76,7 @@ public class HUDHandlerTank implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.secretrooms;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -92,7 +93,7 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.statues;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -68,7 +69,7 @@ public class HUDHandlerStatues implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import codechicken.lib.math.MathHelper;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -150,7 +151,7 @@ public class HUDCargoManager implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -4,6 +4,7 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -85,7 +86,7 @@ public class HUDCartAssembler implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.stevescarts;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -126,7 +127,7 @@ public class HUDLiquidManager implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -1,22 +1,21 @@
package mcp.mobius.waila.addons.thaumcraft;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StringUtils;
import net.minecraft.world.World;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.utils.NBTUtil;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import static mcp.mobius.waila.api.SpecialChars.*;
public class HUDHandlerIAspectContainer implements IWailaDataProvider {
public class HUDHandlerIAspectContainer implements IWailaDataProvider{
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
@@ -29,87 +28,50 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider {
@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.IGoggles.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", 10);
for (int i = 0; i < taglist.tagCount(); i++){
NBTTagCompound subtag = taglist.getCompoundTagAt(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().getDisplayName());
//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;
}
//return false;
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
}
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try{
/*
HashMap knownAspects = (HashMap)ThaumcraftModule.CommonProxy_getKnownAspects.invoke(ThaumcraftModule.Thaumcraft_proxy.get(null));
for (Object o : knownAspects.keySet()){
NBTTagCompound knownAspectsNBT = new NBTTagCompound();
ThaumcraftModule.AspectList_writeToNBT.invoke(knownAspects.get(o), knownAspectsNBT);
NBTTagList aspects = knownAspectsNBT.getTagList("Aspects", 10);
for (int i = 0; i < aspects.tagCount(); i++){
NBTTagCompound entry = aspects.getCompoundTagAt(i);
System.out.printf("%s %s %s\n",o ,entry.getString("key"), entry.getInteger("amount"));
}
}
*/
/*
ThaumcraftModule.AspectList_writeToNBT.invoke(ThaumcraftModule.IAspectContainer_getAspects.invoke(te), tag);
NBTTagList aspects = tag.getTagList("Aspects", 10);
for (int i = 0; i < aspects.tagCount(); i++){
NBTTagCompound entry = aspects.getCompoundTagAt(i);
System.out.printf("%s %s\n", entry.getString("key"), entry.getInteger("amount"));
}
*/
} catch (Exception e) {
throw new RuntimeException(e);
}
return tag;
}
}
@@ -0,0 +1,115 @@
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.tileentity.TileEntity;
import net.minecraft.util.StringUtils;
import net.minecraft.world.World;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.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.IGoggles.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", 10);
for (int i = 0; i < taglist.tagCount(); i++){
NBTTagCompound subtag = taglist.getCompoundTagAt(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().getDisplayName());
//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;
}
//return false;
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
}
}
@@ -3,53 +3,52 @@ package mcp.mobius.waila.addons.thaumcraft;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import net.minecraft.nbt.NBTTagCompound;
import org.apache.logging.log4j.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ThaumcraftModule {
public static Class IAspectContainer = null;
public static Class TileAlchemyFurnace = null;
public static Class IGoggles = null;
public static Class Thaumcraft = null;
public static Class TCClientProxy = null;
public static Class TCCommonProxy = null;
public static Class Aspect = null;
public static Class AspectList = null;
public static Class Thaumcraft = null;
public static Field Thaumcraft_proxy = null;
public static Field TC_proxy = null; //Thaumcraft.proxy
public static Field aspect_tag = null; //Aspect.tag
public static Class IAspectContainer = null;
public static Method IAspectContainer_getAspects = null;
public static Method getKnownAspects = null; //CommonProxy.getKnownAspects
public static Method list_getAspects = null; //AspectList.getAspects
public static Class AspectList = null;
public static Method AspectList_writeToNBT = null;
public static Class CommonProxy = null;
public static Method CommonProxy_getKnownAspects = null;
//public static Class TileAlchemyFurnace = null;
//public static Class IGoggles = null;
public static void register(){
try{
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;
}
Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft");
Thaumcraft_proxy = Thaumcraft.getDeclaredField("proxy");
IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer");
IAspectContainer_getAspects = IAspectContainer.getDeclaredMethod("getAspects");
AspectList = Class.forName("thaumcraft.api.aspects.AspectList");
AspectList_writeToNBT = AspectList.getDeclaredMethod("writeToNBT", NBTTagCompound.class);
CommonProxy = Class.forName("thaumcraft.common.CommonProxy");
CommonProxy_getKnownAspects = CommonProxy.getDeclaredMethod("getKnownAspects");
//TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace");
//IGoggles = Class.forName("thaumcraft.api.IGoggles");
try{
IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer");
TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace");
IGoggles = Class.forName("thaumcraft.api.IGoggles");
TCClientProxy = Class.forName("thaumcraft.client.ClientProxy");
TCCommonProxy = Class.forName("thaumcraft.common.CommonProxy");
Aspect = Class.forName("thaumcraft.api.aspects.Aspect");
AspectList = Class.forName("thaumcraft.api.aspects.AspectList");
TC_proxy = Thaumcraft.getDeclaredField("proxy");
aspect_tag = Aspect.getDeclaredField("tag");
aspect_tag.setAccessible(true);
getKnownAspects = TCCommonProxy.getDeclaredMethod("getKnownAspects");
list_getAspects = AspectList.getDeclaredMethod("getAspects");
ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
//ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), IAspectContainer);
//ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e);
@@ -57,13 +56,10 @@ public class ThaumcraftModule {
} catch (Exception e){
Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e);
return;
}
}
ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), IAspectContainer);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
}
}
@@ -0,0 +1,69 @@
package mcp.mobius.waila.addons.thaumcraft;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import org.apache.logging.log4j.Level;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
public class ThaumcraftModule {
public static Class IAspectContainer = null;
public static Class TileAlchemyFurnace = null;
public static Class IGoggles = null;
public static Class Thaumcraft = null;
public static Class TCClientProxy = null;
public static Class TCCommonProxy = null;
public static Class Aspect = null;
public static Class AspectList = null;
public static Field TC_proxy = null; //Thaumcraft.proxy
public static Field aspect_tag = null; //Aspect.tag
public static Method getKnownAspects = null; //CommonProxy.getKnownAspects
public static Method list_getAspects = null; //AspectList.getAspects
public static void register(){
try{
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{
IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer");
TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace");
IGoggles = Class.forName("thaumcraft.api.IGoggles");
TCClientProxy = Class.forName("thaumcraft.client.ClientProxy");
TCCommonProxy = Class.forName("thaumcraft.common.CommonProxy");
Aspect = Class.forName("thaumcraft.api.aspects.Aspect");
AspectList = Class.forName("thaumcraft.api.aspects.AspectList");
TC_proxy = Thaumcraft.getDeclaredField("proxy");
aspect_tag = Aspect.getDeclaredField("tag");
aspect_tag.setAccessible(true);
getKnownAspects = TCCommonProxy.getDeclaredMethod("getKnownAspects");
list_getAspects = AspectList.getDeclaredMethod("getAspects");
} catch (ClassNotFoundException e){
Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e);
return;
} catch (Exception e){
Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e);
return;
}
ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects");
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), IAspectContainer);
ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
}
}
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -42,7 +43,7 @@ public class HUDHandlerEnergyCell implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try {
int recv = ThermalExpansionModule.TileEnergyCell_Recv.getInt(te);
int send = ThermalExpansionModule.TileEnergyCell_Send.getInt(te);
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -49,7 +50,7 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try{
int energy = (Integer) ThermalExpansionModule.IEnergyHandler_getCurStorage.invoke(te, ForgeDirection.UNKNOWN);
tag.setInteger("Energy", energy);
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -61,7 +62,7 @@ public class HUDHandlerISecureTile implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try {
String owner = (String) ThermalExpansionModule.ISecureTile_getOwnerName.invoke(te);
int access = ((Enum) ThermalExpansionModule.ISecureTile_getAccess.invoke(te)).ordinal();
@@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -83,7 +84,7 @@ public class HUDHandlerTank implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try {
int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(te);
tag.setInteger("Amount", amount);
@@ -3,6 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
import java.util.List;
import mcp.mobius.waila.cbcore.LangUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -92,7 +93,7 @@ public class HUDHandlerTesseract implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
try {
byte modeItem = ThermalExpansionModule.TileTesseract_Item.getByte(te);
byte modeFluid = ThermalExpansionModule.TileTesseract_Fluid.getByte(te);
@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.twilightforest;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -33,7 +34,7 @@ public class TwilightForestGenericOverride implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
return tag;
}
}
@@ -5,6 +5,7 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRedstoneOre;
import net.minecraft.block.BlockSilverfish;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@@ -206,7 +207,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -2,6 +2,7 @@ package mcp.mobius.waila.api;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -39,5 +40,5 @@ public interface IWailaDataProvider{
* NBTTagCompound tag argument is the current NBT tag passed along by the various providers (first provider will be empty).
* You HAVE TO return it if you registered as a provider, even if you are not doing anything to it (similar to the tooltip lists).
* */
NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z);
NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z);
}
@@ -10,6 +10,7 @@ import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.utils.Constants;
import mcp.mobius.waila.utils.ModIdentification;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -86,7 +87,7 @@ public class HUDHandlerBlocks implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
return tag;
}
}
@@ -4,6 +4,7 @@ import java.util.List;
import org.apache.logging.log4j.Level;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
@@ -80,7 +81,7 @@ public class HUDHandlerFMP implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
if (te != null)
te.writeToNBT(tag);
return tag;
@@ -6,12 +6,15 @@ import java.util.HashMap;
import java.util.HashSet;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.impl.ModuleRegistrar;
import mcp.mobius.waila.utils.NBTUtil;
import mcp.mobius.waila.utils.WailaExceptionHandler;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@@ -107,17 +110,34 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x0
tag.setInteger("z", msg.posZ);
tag.setString ("id", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass()));
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(block))
tag = provider.getNBTData(entity, tag, world, msg.posX, msg.posY, msg.posZ);
EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity;
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(block)){
try{
tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
} catch (AbstractMethodError ame){
Method getNBTData = provider.getClass().getMethod("getNBTData", TileEntity.class, NBTTagCompound.class, World.class, int.class, int.class, int.class);
tag = (NBTTagCompound)getNBTData.invoke(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
}
}
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(entity))
tag = provider.getNBTData(entity, tag, world, msg.posX, msg.posY, msg.posZ);
for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(entity)){
try{
tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
} catch (AbstractMethodError ame){
Method getNBTData = provider.getClass().getMethod("getNBTData", TileEntity.class, NBTTagCompound.class, World.class, int.class, int.class, int.class);
tag = (NBTTagCompound)getNBTData.invoke(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
}
}
} else {
entity.writeToNBT(tag);
tag = NBTUtil.createTag(tag, msg.keys);
}
for (Object s : tag.func_150296_c())
System.out.printf("%s\n", s);
tag.setInteger("WailaX", msg.posX);
tag.setInteger("WailaY", msg.posY);
tag.setInteger("WailaZ", msg.posZ);
@@ -127,6 +147,7 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x0
}catch(Throwable e){
e.printStackTrace();
WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
}
}
@@ -49,7 +49,7 @@ public class ProxyServer {
IC2Module.register();
/*Thaumcraft*/
//ThaumcraftModule.register();
ThaumcraftModule.register();
/*EnderStorage*/
EnderStorageModule.register();
@@ -67,7 +67,7 @@ public class ProxyServer {
ETBModule.register();
/* EnderIO */
EnderIOModule.register();
//EnderIOModule.register();
/* ProjectRed API */
ProjectRedModule.register();
@@ -0,0 +1,12 @@
package mcp.mobius.wailacore.asm;
import java.io.IOException;
import cpw.mods.fml.common.asm.transformers.AccessTransformer;
public class CoreAccessTransformer extends AccessTransformer {
public CoreAccessTransformer() throws IOException {
//super("waila_at.cfg");
}
}
@@ -0,0 +1,35 @@
package mcp.mobius.wailacore.asm;
import java.util.Arrays;
import com.google.common.eventbus.EventBus;
import cpw.mods.fml.common.DummyModContainer;
import cpw.mods.fml.common.LoadController;
import cpw.mods.fml.common.ModMetadata;
public class CoreContainer extends DummyModContainer {
public CoreContainer()
{
super(new ModMetadata());
ModMetadata md = getMetadata();
md.modId = "WailaCore";
md.name = "WailaCore";
md.version = "1.0.0";
md.credits = "ProfMobius";
md.authorList = Arrays.asList("ProfMobius");
md.description = "Coremod associated with Waila to force backward compatibility with the API";
md.url = "profmobius.blogspot.com";
}
@Override
public boolean registerBus(EventBus bus, LoadController controller)
{
//bus.register(this);
// this needs to return true, otherwise the mod will be deactivated by FML
return true;
}
}
@@ -0,0 +1,43 @@
package mcp.mobius.wailacore.asm;
import java.io.File;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
@IFMLLoadingPlugin.TransformerExclusions("mcp.mobius.wailacore.asm")
public class CoreDescription implements IFMLLoadingPlugin {
public static final Logger log = LogManager.getLogger("WailaCore");
@Override
public String[] getASMTransformerClass() {
return new String[] { "mcp.mobius.wailacore.asm.CoreTransformer" };
}
@Override
public String getModContainerClass() {
return "mcp.mobius.wailacore.asm.CoreContainer";
}
@Override
public String getSetupClass() {
return null;
}
@Override
public void injectData(Map<String, Object> data) {
if(data.containsKey("coremodLocation"))
location = (File) data.get("coremodLocation");
}
public static File location;
@Override
public String getAccessTransformerClass() {
return "mcp.mobius.wailacore.asm.CoreAccessTransformer";
}
}
@@ -0,0 +1,73 @@
package mcp.mobius.wailacore.asm;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
import net.minecraft.launchwrapper.IClassTransformer;
public class CoreTransformer implements IClassTransformer {
public CoreTransformer(){
super();
}
@Override
public byte[] transform(String name, String srgname, byte[] bytes) {
/*
boolean changed = false;
ClassNode classNode = new ClassNode();
ClassReader classReader = new ClassReader(bytes);
classReader.accept(classNode, 0);
for (MethodNode methodNode : classNode.methods){
if (methodNode.name.equals("getNBTData")
&& methodNode.desc.equals("(Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/World;III)Lnet/minecraft/nbt/NBTTagCompound;"))
{
methodNode.desc = "(Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/World;III)Lnet/minecraft/nbt/NBTTagCompound;";
changed = true;
CoreDescription.log.info(String.format("Class %s implements outdated getNBTData signature. Updating signature to most recent API.", name));
}
}
if (changed){
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
classNode.accept(writer);
return writer.toByteArray();
}
*/
/*
if (classNode.interfaces.contains("mcp/mobius/waila/api/IWailaDataProvider")){
CoreDescription.log.info(String.format("Identified Waila plugin class : %s", name));
for (MethodNode methodNode : classNode.methods){
CoreDescription.log.info(String.format(" %s - %s | %s | %s | %s", name, methodNode.access, methodNode.name, methodNode.desc, methodNode.signature));
if (methodNode.name.equals("getNBTData")
&& methodNode.desc.equals("(Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/World;III)Lnet/minecraft/nbt/NBTTagCompound;"))
{
methodNode.desc = "(Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/world/World;III)Lnet/minecraft/nbt/NBTTagCompound;";
CoreDescription.log.info(String.format("Class %s implements outdated getNBTData signature. Updating signature to most recent API.", name));
}
}
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
classNode.accept(writer);
return writer.toByteArray();
}
*/
return bytes;
}
}