diff --git a/build.gradle b/build.gradle index 617666d..eb94cff 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.6a_1.7.10" +version = "1.5.7_dev1_1.7.10" group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Waila" diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java index d216b2b..0e01273 100644 --- a/src/main/java/mcp/mobius/waila/Waila.java +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -44,7 +44,7 @@ import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.client.KeyEvent; import mcp.mobius.waila.commands.CommandDumpHandlers; -@Mod(modid="Waila", name="Waila", version="1.5.6a", dependencies="required-after:NotEnoughItems", acceptableRemoteVersions="*") +@Mod(modid="Waila", name="Waila", version="1.5.7", dependencies="required-after:NotEnoughItems", acceptableRemoteVersions="*") /* @NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)") diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java.bak b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java.bak deleted file mode 100644 index e22d19a..0000000 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java.bak +++ /dev/null @@ -1,115 +0,0 @@ -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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } - - @Override - public List getWailaBody(ItemStack itemStack, List 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 getWailaTail(ItemStack itemStack, List 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)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; - } - -} diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java.bak b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java.bak deleted file mode 100644 index 7e25ed2..0000000 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java.bak +++ /dev/null @@ -1,69 +0,0 @@ -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); - } - -}