From 4ee7d7396c8a27b994d49169140edbf9adfdc2dc Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 29 Jan 2023 12:42:42 -0800 Subject: [PATCH] [ci skip] spotlessApply with the new settings --- src/main/java/mcp/mobius/waila/Waila.java | 238 +++-- .../addons/agriculture/AgricultureModule.java | 46 +- .../addons/agriculture/HUDHandlerCrop.java | 69 +- .../waila/addons/buildcraft/BCModule.java | 58 +- .../addons/buildcraft/HUDHandlerBCTanks.java | 116 +-- .../addons/carpenters/CarpentersModule.java | 55 +- .../carpenters/HUDCarpentersBlocksTE.java | 86 +- .../waila/addons/enderio/EnderIOModule.java | 108 +-- .../addons/enderio/HUDHandlerCapacitor.java | 148 +-- .../addons/enderio/HUDHandlerTesseract.java | 136 +-- .../enderstorage/EnderStorageModule.java | 94 +- .../enderstorage/HUDHandlerStorage.java | 126 ++- .../mobius/waila/addons/etb/ETBModule.java | 143 ++- .../waila/addons/etb/HUDHandlerSocket.java | 181 ++-- .../addons/exu/ExtraUtilitiesModule.java | 51 +- .../waila/addons/exu/HUDHandlerDrum.java | 89 +- .../addons/gravestone/GravestoneModule.java | 41 +- .../gravestone/HUDHandlerGravestone.java | 58 +- .../harvestcraft/HUDHandlerPamCrop.java | 74 +- .../harvestcraft/HarvestcraftModule.java | 46 +- .../addons/ic2/HUDHandlerTEGenerator.java | 193 ++-- .../mobius/waila/addons/ic2/IC2Module.java | 159 +-- .../magicalcrops/HUDHandlerMagicalCrops.java | 72 +- .../magicalcrops/MagicalCropsModule.java | 46 +- .../addons/openblocks/HUDHandlerTank.java | 121 +-- .../addons/openblocks/OpenBlocksModule.java | 54 +- .../projectred/HUDDecoratorRsGateLogic.java | 495 ++++++---- .../addons/projectred/HUDFMPGateLogic.java | 148 +-- .../addons/projectred/ProjectRedModule.java | 66 +- .../addons/railcraft/HUDHandlerTank.java | 130 +-- .../addons/railcraft/RailcraftModule.java | 71 +- .../addons/secretrooms/HUDTileEntityCamo.java | 130 +-- .../addons/secretrooms/SecretRoomsModule.java | 57 +- .../addons/statues/HUDHandlerStatues.java | 124 +-- .../waila/addons/statues/StatuesModule.java | 60 +- .../addons/stevescarts/HUDCargoManager.java | 208 ++-- .../addons/stevescarts/HUDCartAssembler.java | 117 +-- .../addons/stevescarts/HUDLiquidManager.java | 242 ++--- .../stevescarts/HUDMinecartModular.java | 169 ++-- .../addons/stevescarts/StevesCartsModule.java | 112 +-- .../HUDHandlerIAspectContainer.java | 199 ++-- .../addons/thaumcraft/ThaumcraftModule.java | 123 ++- .../thermaldynamics/HUDHandlerDuct.java | 29 +- .../ThermalDynamicsModule.java | 35 +- .../thermalexpansion/HUDHandlerCache.java | 93 +- .../HUDHandlerEnergyCell.java | 89 +- .../HUDHandlerIBlockInfo.java | 79 +- .../HUDHandlerIEnergyHandler.java | 129 +-- .../HUDHandlerISecureTile.java | 124 +-- .../thermalexpansion/HUDHandlerTank.java | 162 ++-- .../thermalexpansion/HUDHandlerTesseract.java | 189 ++-- .../ThermalExpansionModule.java | 299 +++--- .../TwilightForestGenericOverride.java | 55 +- .../twilightforest/TwilightForestModule.java | 49 +- .../addons/vanillamc/HUDDecoratorVanilla.java | 103 +- .../addons/vanillamc/HUDHandlerFurnace.java | 141 +-- .../addons/vanillamc/HUDHandlerVanilla.java | 523 +++++----- .../mcp/mobius/waila/api/ITaggedList.java | 35 +- .../mcp/mobius/waila/api/IWailaBlock.java | 56 +- .../waila/api/IWailaBlockDecorator.java | 22 +- .../waila/api/IWailaCommonAccessor.java | 50 +- .../mobius/waila/api/IWailaConfigHandler.java | 65 +- .../mobius/waila/api/IWailaDataAccessor.java | 49 +- .../mobius/waila/api/IWailaDataProvider.java | 146 +-- .../waila/api/IWailaEntityAccessor.java | 28 +- .../waila/api/IWailaEntityProvider.java | 137 +-- .../mobius/waila/api/IWailaFMPAccessor.java | 34 +- .../mobius/waila/api/IWailaFMPDecorator.java | 22 +- .../mobius/waila/api/IWailaFMPProvider.java | 89 +- .../mcp/mobius/waila/api/IWailaRegistrar.java | 136 +-- .../waila/api/IWailaSummaryProvider.java | 27 +- .../waila/api/IWailaTooltipRenderer.java | 37 +- .../mcp/mobius/waila/api/SpecialChars.java | 134 +-- .../mobius/waila/api/impl/ConfigHandler.java | 304 +++--- .../mobius/waila/api/impl/ConfigModule.java | 32 +- .../waila/api/impl/DataAccessorCommon.java | 351 +++---- .../waila/api/impl/DataAccessorFMP.java | 191 ++-- .../waila/api/impl/MetaDataProvider.java | 399 ++++---- .../waila/api/impl/ModuleRegistrar.java | 906 ++++++++---------- .../mcp/mobius/waila/api/impl/TipList.java | 323 +++---- .../mcp/mobius/waila/api/package-info.java | 5 +- .../mcp/mobius/waila/cbcore/LangUtil.java | 88 +- .../java/mcp/mobius/waila/cbcore/Layout.java | 7 +- .../mcp/mobius/waila/client/KeyEvent.java | 117 ++- .../mcp/mobius/waila/client/ProxyClient.java | 97 +- .../waila/commands/CommandDumpHandlers.java | 180 ++-- .../mobius/waila/gui/events/MouseEvent.java | 182 ++-- .../waila/gui/helpers/ReverseIterator.java | 12 +- .../mobius/waila/gui/helpers/UIException.java | 1 + .../mobius/waila/gui/helpers/UIHelper.java | 286 ++++-- .../mobius/waila/gui/interfaces/CType.java | 8 +- .../mobius/waila/gui/interfaces/IWidget.java | 136 +-- .../waila/gui/interfaces/RenderPriority.java | 6 +- .../mobius/waila/gui/interfaces/Signal.java | 8 +- .../mobius/waila/gui/interfaces/WAlign.java | 6 +- .../mobius/waila/gui/screens/ScreenBase.java | 152 ++- .../gui/screens/config/ScreenConfig.java | 44 +- .../gui/screens/config/ScreenHUDConfig.java | 519 +++++----- .../screens/config/ScreenModuleChoice.java | 36 +- .../screens/config/ScreenModuleConfig.java | 78 +- .../gui/screens/config/ScreenWailaConfig.java | 120 ++- .../gui/screens/info/ScreenEnchants.java | 133 +-- .../mobius/waila/gui/testing/ScreenTest.java | 87 +- .../mobius/waila/gui/testing/ScreenTest2.java | 39 +- .../waila/gui/truetyper/FontHelper.java | 186 ++-- .../waila/gui/truetyper/FontLoader.java | 105 +- .../mobius/waila/gui/truetyper/Formatter.java | 154 ++- .../mcp/mobius/waila/gui/truetyper/Test.java | 91 +- .../waila/gui/truetyper/TrueTypeFont.java | 845 ++++++++-------- .../waila/gui/widgets/ItemStackDisplay.java | 65 +- .../waila/gui/widgets/LabelFixedFont.java | 101 +- .../mobius/waila/gui/widgets/LayoutBase.java | 68 +- .../waila/gui/widgets/LayoutCanvas.java | 196 ++-- .../waila/gui/widgets/LayoutCropping.java | 104 +- .../waila/gui/widgets/LayoutMargin.java | 62 +- .../waila/gui/widgets/PictureDisplay.java | 36 +- .../waila/gui/widgets/PictureSwitch.java | 69 +- .../mobius/waila/gui/widgets/ViewTable.java | 433 +++++---- .../waila/gui/widgets/ViewportScrollable.java | 323 ++++--- .../mobius/waila/gui/widgets/WidgetBase.java | 665 ++++++------- .../waila/gui/widgets/WidgetGeometry.java | 348 +++---- .../waila/gui/widgets/buttons/ButtonBase.java | 107 ++- .../gui/widgets/buttons/ButtonBoolean.java | 75 +- .../widgets/buttons/ButtonBooleanConfig.java | 109 ++- .../buttons/ButtonBooleanConfigRemote.java | 86 +- .../gui/widgets/buttons/ButtonContainer.java | 91 +- .../widgets/buttons/ButtonContainerLabel.java | 112 ++- .../gui/widgets/buttons/ButtonInteger.java | 72 +- .../widgets/buttons/ButtonIntegerConfig.java | 61 +- .../gui/widgets/buttons/ButtonLabel.java | 34 +- .../widgets/buttons/ButtonScreenChange.java | 48 +- .../gui/widgets/movable/PictureMovableRC.java | 95 +- .../mobius/waila/handlers/DecoratorFMP.java | 76 +- .../waila/handlers/HUDHandlerBlocks.java | 125 ++- .../waila/handlers/HUDHandlerEntities.java | 155 +-- .../mobius/waila/handlers/HUDHandlerFMP.java | 196 ++-- .../waila/handlers/VanillaTooltipHandler.java | 16 +- .../waila/handlers/nei/HandlerEnchants.java | 227 ++--- .../waila/handlers/nei/ModNameFilter.java | 60 +- .../mobius/waila/handlers/nei/NEIHandler.java | 130 +-- .../waila/handlers/nei/OreDictFilter.java | 63 +- .../handlers/nei/TooltipHandlerWaila.java | 34 +- .../mobius/waila/network/IWailaMessage.java | 6 +- .../waila/network/Message0x00ServerPing.java | 89 +- .../waila/network/Message0x01TERequest.java | 243 +++-- .../waila/network/Message0x02TENBTData.java | 54 +- .../waila/network/Message0x03EntRequest.java | 124 +-- .../waila/network/Message0x04EntNBTData.java | 50 +- .../mobius/waila/network/NetworkHandler.java | 13 +- .../waila/network/WailaPacketHandler.java | 139 ++- .../waila/overlay/DecoratorRenderer.java | 78 +- .../mcp/mobius/waila/overlay/DisplayUtil.java | 304 +++--- .../java/mcp/mobius/waila/overlay/IconUI.java | 73 +- .../mobius/waila/overlay/OverlayConfig.java | 42 +- .../mobius/waila/overlay/OverlayRenderer.java | 209 ++-- .../mcp/mobius/waila/overlay/RayTracing.java | 347 ++++--- .../mcp/mobius/waila/overlay/Tooltip.java | 413 ++++---- .../waila/overlay/WailaTickHandler.java | 262 +++-- .../tooltiprenderers/TTRenderHealth.java | 99 +- .../tooltiprenderers/TTRenderIcon.java | 34 +- .../tooltiprenderers/TTRenderProgressBar.java | 43 +- .../tooltiprenderers/TTRenderStack.java | 49 +- .../tooltiprenderers/TTRenderString.java | 40 +- .../tooltiprenderers/TTRenderTrueTyper.java | 49 +- .../mcp/mobius/waila/server/ProxyServer.java | 225 ++--- .../mcp/mobius/waila/utils/AccessHelper.java | 265 +++-- .../mcp/mobius/waila/utils/Constants.java | 77 +- .../mobius/waila/utils/ModIdentification.java | 200 ++-- .../java/mcp/mobius/waila/utils/NBTUtil.java | 161 ++-- .../waila/utils/WailaExceptionHandler.java | 45 +- 170 files changed, 11621 insertions(+), 11013 deletions(-) diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java index ed77a95..61c3abf 100644 --- a/src/main/java/mcp/mobius/waila/Waila.java +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -1,7 +1,20 @@ package mcp.mobius.waila; import java.lang.reflect.Field; -import java.lang.reflect.Method; + +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.client.KeyEvent; +import mcp.mobius.waila.commands.CommandDumpHandlers; +import mcp.mobius.waila.network.NetworkHandler; +import mcp.mobius.waila.network.WailaPacketHandler; +import mcp.mobius.waila.overlay.DecoratorRenderer; +import mcp.mobius.waila.overlay.OverlayConfig; +import mcp.mobius.waila.overlay.WailaTickHandler; +import mcp.mobius.waila.server.ProxyServer; +import mcp.mobius.waila.utils.ModIdentification; + +import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,22 +22,6 @@ import org.apache.logging.log4j.Logger; import com.google.common.eventbus.EventBus; 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.network.NetworkHandler; -import mcp.mobius.waila.network.WailaPacketHandler; -import mcp.mobius.waila.overlay.OverlayConfig; -import mcp.mobius.waila.overlay.DecoratorRenderer; -import mcp.mobius.waila.overlay.WailaTickHandler; -import mcp.mobius.waila.server.ProxyServer; -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.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLModContainer; import cpw.mods.fml.common.Mod; @@ -38,38 +35,40 @@ 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.event.FMLServerStartingEvent; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.client.KeyEvent; -import mcp.mobius.waila.commands.CommandDumpHandlers; -@Mod(modid="Waila", name="Waila", version="GRADLETOKEN_VERSION", dependencies="after:NotEnoughItems@[1.0.4.0,)", acceptableRemoteVersions="*") +@Mod( + modid = "Waila", + name = "Waila", + version = "GRADLETOKEN_VERSION", + dependencies = "after:NotEnoughItems@[1.0.4.0,)", + acceptableRemoteVersions = "*") /* -@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, - packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)") - //packetHandler = WailaPacketHandler.class) -*/ + * @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. - @Instance("Waila") - public static Waila instance; - @SidedProxy(clientSide="mcp.mobius.waila.client.ProxyClient", serverSide="mcp.mobius.waila.server.ProxyServer") - public static ProxyServer proxy; - public static Logger log = LogManager.getLogger("Waila"); - public boolean serverPresent = false; - + // The instance of your mod that Forge uses. + @Instance("Waila") + public static Waila instance; + + @SidedProxy(clientSide = "mcp.mobius.waila.client.ProxyClient", serverSide = "mcp.mobius.waila.server.ProxyServer") + public static ProxyServer proxy; + public static Logger log = LogManager.getLogger("Waila"); + public boolean serverPresent = false; + /* INIT SEQUENCE */ @EventHandler public void preInit(FMLPreInitializationEvent event) { - ConfigHandler.instance().loadDefaultConfig(event); - OverlayConfig.updateColors(); - MinecraftForge.EVENT_BUS.register(new DecoratorRenderer()); - WailaPacketHandler.INSTANCE.ordinal(); - } - + ConfigHandler.instance().loadDefaultConfig(event); + OverlayConfig.updateColors(); + MinecraftForge.EVENT_BUS.register(new DecoratorRenderer()); + WailaPacketHandler.INSTANCE.ordinal(); + } + @EventHandler public void initialize(FMLInitializationEvent event) { try { @@ -78,98 +77,81 @@ 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 KeyEvent()); - FMLCommonHandler.instance().bus().register(WailaTickHandler.instance()); - + + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { + MinecraftForge.EVENT_BUS.register(new DecoratorRenderer()); + FMLCommonHandler.instance().bus().register(new KeyEvent()); + FMLCommonHandler.instance().bus().register(WailaTickHandler.instance()); + } - FMLCommonHandler.instance().bus().register(new NetworkHandler()); - } + FMLCommonHandler.instance().bus().register(new NetworkHandler()); + } @EventHandler public void postInit(FMLPostInitializationEvent event) { - proxy.registerHandlers(); - ModIdentification.init(); - - /* - if (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)) - orig = LanguageRegistry.instance().getStringLocalization(key); - if (orig.equals(key)) - orig = LangUtil.translateG(key); - if (orig.isEmpty()) - orig = key; - - String modif; - if (orig.startsWith("[") || orig.contains(":")) - modif = orig; - else{ - String id = ModIdentification.keyhandlerStrings.get(key); - - if (id.contains(".")) - id = id.split("\\.")[0]; - - if (id.length() > 10) - id = id.substring(0, 11); - - if (id.isEmpty()) - id = "????"; - - modif = String.format("[%s] %s", id, orig); - } - - LanguageRegistry.instance().addStringLocalization(key, modif); - } - } - */ - - } + proxy.registerHandlers(); + ModIdentification.init(); + + /* + * if (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)) orig = LanguageRegistry.instance().getStringLocalization(key); if (orig.equals(key)) orig + * = LangUtil.translateG(key); if (orig.isEmpty()) orig = key; String modif; if (orig.startsWith("[") || + * orig.contains(":")) modif = orig; else{ String id = ModIdentification.keyhandlerStrings.get(key); if + * (id.contains(".")) id = id.split("\\.")[0]; if (id.length() > 10) id = id.substring(0, 11); if (id.isEmpty()) + * id = "????"; modif = String.format("[%s] %s", id, orig); } + * LanguageRegistry.instance().addStringLocalization(key, modif); } } + */ + + } @Subscribe - public void loadComplete(FMLLoadCompleteEvent event) { - proxy.registerMods(); - proxy.registerIMCs(); - - /* - String[] ores = OreDictionary.getOreNames(); - for (String s : ores) - for (ItemStack stack : OreDictionary.getOres(s)) - System.out.printf("%s : %s\n", s, stack); - */ - } - - @EventHandler - public void processIMC(FMLInterModComms.IMCEvent event) - { - for (IMCMessage imcMessage : event.getMessages()){ - if (!imcMessage.isStringMessage()) continue; - - if (imcMessage.key.equalsIgnoreCase("addconfig")){ - String[] params = imcMessage.getStringValue().split("\\$\\$"); - if (params.length != 3){ - Waila.log.warn(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue())); - continue; - } - Waila.log.info(String.format("Receiving config request from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue())); - ConfigHandler.instance().addConfig(params[0], params[1], params[2]); - } - - if (imcMessage.key.equalsIgnoreCase("register")){ - Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue())); - ModuleRegistrar.instance().addIMCRequest(imcMessage.getStringValue(), imcMessage.getSender()); - } - } - } - + public void loadComplete(FMLLoadCompleteEvent event) { + proxy.registerMods(); + proxy.registerIMCs(); - - @EventHandler - public void serverStarting(FMLServerStartingEvent event){ - event.registerServerCommand(new CommandDumpHandlers()); - } -} \ No newline at end of file + /* + * String[] ores = OreDictionary.getOreNames(); for (String s : ores) for (ItemStack stack : + * OreDictionary.getOres(s)) System.out.printf("%s : %s\n", s, stack); + */ + } + + @EventHandler + public void processIMC(FMLInterModComms.IMCEvent event) { + for (IMCMessage imcMessage : event.getMessages()) { + if (!imcMessage.isStringMessage()) continue; + + if (imcMessage.key.equalsIgnoreCase("addconfig")) { + String[] params = imcMessage.getStringValue().split("\\$\\$"); + if (params.length != 3) { + Waila.log.warn( + String.format( + "Error while parsing config option from [ %s ] for %s", + imcMessage.getSender(), + imcMessage.getStringValue())); + continue; + } + Waila.log.info( + String.format( + "Receiving config request from [ %s ] for %s", + imcMessage.getSender(), + imcMessage.getStringValue())); + ConfigHandler.instance().addConfig(params[0], params[1], params[2]); + } + + if (imcMessage.key.equalsIgnoreCase("register")) { + Waila.log.info( + String.format( + "Receiving registration request from [ %s ] for method %s", + imcMessage.getSender(), + imcMessage.getStringValue())); + ModuleRegistrar.instance().addIMCRequest(imcMessage.getStringValue(), imcMessage.getSender()); + } + } + } + + @EventHandler + public void serverStarting(FMLServerStartingEvent event) { + event.registerServerCommand(new CommandDumpHandlers()); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java index 7b8bc07..237d99e 100644 --- a/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java +++ b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java @@ -1,30 +1,30 @@ package mcp.mobius.waila.addons.agriculture; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -public class AgricultureModule { - public static Class BlockCrop = null; +import org.apache.logging.log4j.Level; - - 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.WARN, "[Agriculture] Class not found. " + e); - return; - } - - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCrop(), BlockCrop); - } +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.WARN, "[Agriculture] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCrop(), BlockCrop); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java index f7582b1..74061ac 100644 --- a/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java +++ b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java @@ -2,50 +2,55 @@ package mcp.mobius.waila.addons.agriculture; import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; public class HUDHandlerCrop implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("general.showcrop")) return currenttip; - - int growthStage = accessor.getMetadata(); + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("general.showcrop")) return currenttip; - 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; - } + int growthStage = accessor.getMetadata(); - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + return tag; + } - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - return tag; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java index 95904cd..7b0cffc 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java @@ -2,43 +2,41 @@ package mcp.mobius.waila.addons.buildcraft; import java.lang.reflect.Method; -import org.apache.logging.log4j.Level; - -import net.minecraftforge.common.util.ForgeDirection; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import net.minecraftforge.common.util.ForgeDirection; + +import org.apache.logging.log4j.Level; + public class BCModule { - public static Class TileTank = null; - public static Method TileTank_getTankInfo = null; - - //public static Class IPowerReceptor = null; - //public static Class PipeTransportPower = null; - //public static Class TileGenericPipe = null; - //public static Class TileEngine = null; - + public static Class TileTank = null; + public static Method TileTank_getTankInfo = null; + // public static Class IPowerReceptor = null; + // public static Class PipeTransportPower = null; + // public static Class TileGenericPipe = null; + // public static Class TileEngine = null; - public static void register(){ - try{ - TileTank = Class.forName("buildcraft.factory.TileTank"); - TileTank_getTankInfo = TileTank.getMethod("getTankInfo", ForgeDirection.class); + public static void register() { + try { + TileTank = Class.forName("buildcraft.factory.TileTank"); + TileTank_getTankInfo = TileTank.getMethod("getTankInfo", ForgeDirection.class); - ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount"); - ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype"); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank); - - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[BC] Class not found. " + e); - return; - } catch (NoSuchMethodException e){ - Waila.log.log(Level.WARN, "[BC] Method not found." + e); - return; - } - + ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount"); + ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype"); + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank); + + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[BC] Class not found. " + e); + return; + } catch (NoSuchMethodException e) { + Waila.log.log(Level.WARN, "[BC] Method not found." + e); + return; + } + + } - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java index 45f632f..0108052 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java @@ -2,18 +2,13 @@ package mcp.mobius.waila.addons.buildcraft; import java.util.List; -//import buildcraft.factory.TileTank; - - - - -import org.apache.logging.log4j.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.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -22,62 +17,69 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import mcp.mobius.waila.cbcore.LangUtil; + +import org.apache.logging.log4j.Level; public class HUDHandlerBCTanks implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - FluidTankInfo tank = this.getTank(accessor); - FluidStack stack = tank != null ? tank.fluid : null; + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + FluidTankInfo tank = this.getTank(accessor); + FluidStack stack = tank != null ? tank.fluid : null; + String name = currenttip.get(0); + if (stack != null && ConfigHandler.instance().getConfig("bc.tanktype")) + name = name + " (" + stack.getFluid().getName() + ")"; + else if (stack == null && ConfigHandler.instance().getConfig("bc.tanktype")) + name = name + " " + LangUtil.translateG("hud.msg.empty"); + currenttip.set(0, name); + return currenttip; + } - String name = currenttip.get(0); - if (stack != null && ConfigHandler.instance().getConfig("bc.tanktype")) - name = name + " (" + stack.getFluid().getName() + ")"; - else if (stack == null && ConfigHandler.instance().getConfig("bc.tanktype")) - name = name + " " + LangUtil.translateG("hud.msg.empty"); - currenttip.set(0, name); - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + FluidTankInfo tank = this.getTank(accessor); + FluidStack stack = tank != null ? tank.fluid : null; + int liquidAmount = stack != null ? stack.amount : 0; + int capacity = tank != null ? tank.capacity : 0; - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - FluidTankInfo tank = this.getTank(accessor); - FluidStack stack = tank != null ? tank.fluid : null; - int liquidAmount = stack != null ? stack.amount:0; - int capacity = tank != null ? tank.capacity : 0; - - if (ConfigHandler.instance().getConfig("bc.tankamount")) - currenttip.add(String.valueOf(liquidAmount) + "/" + String.valueOf(capacity) + " mB"); - - return currenttip; - } + if (ConfigHandler.instance().getConfig("bc.tankamount")) + currenttip.add(String.valueOf(liquidAmount) + "/" + String.valueOf(capacity) + " mB"); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + public FluidTankInfo getTank(IWailaDataAccessor accessor) { + FluidTankInfo tank = null; + try { + tank = ((FluidTankInfo[]) BCModule.TileTank_getTankInfo + .invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0]; + } catch (Exception e) { + Waila.log.log( + Level.ERROR, + "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e)); + return null; + } + return tank; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + return tag; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } - - public FluidTankInfo getTank(IWailaDataAccessor accessor){ - FluidTankInfo tank = null; - try{ - tank = ((FluidTankInfo[])BCModule.TileTank_getTankInfo.invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0]; - } catch (Exception e){ - Waila.log.log(Level.ERROR, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e)); - return null; - } - return tank; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - return tag; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java index e5a1666..66da0cb 100644 --- a/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java @@ -2,39 +2,26 @@ package mcp.mobius.waila.addons.carpenters; 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; - } + 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); + */ + } - 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); - */ - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java index b907ef8..cfec4a0 100644 --- a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java @@ -2,65 +2,55 @@ package mcp.mobius.waila.addons.carpenters; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -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; + @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; + } - 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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @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) { + return currenttip; + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java index d64124b..6c6ef70 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java @@ -2,64 +2,64 @@ package mcp.mobius.waila.addons.enderio; import java.lang.reflect.Method; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class EnderIOModule { - public static Class TileCapacitorBank = null; - public static Method TCB_getMaxInput = null; - public static Method TCB_getMaxOutput = null; - public static Method TCB_getEnergyStored = null; - public static Method TCB_getMaxEnergyStored = null; - public static Method TCB_getMaxIO = null; + public static Class TileCapacitorBank = null; + public static Method TCB_getMaxInput = null; + public static Method TCB_getMaxOutput = null; + public static Method TCB_getEnergyStored = null; + public static Method TCB_getMaxEnergyStored = null; + public static Method TCB_getMaxIO = null; + + public static Class TileTesseract = null; + + public static void register() { + try { + Class ModClass = Class.forName("crazypants.enderio.EnderIO"); + Waila.log.log(Level.INFO, "EnderIO mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found."); + return; + } + + try { + + TileCapacitorBank = Class.forName("crazypants.enderio.machine.power.TileCapacitorBank"); + TCB_getEnergyStored = TileCapacitorBank.getMethod("getEnergyStored"); + TCB_getMaxInput = TileCapacitorBank.getMethod("getMaxInput"); + TCB_getMaxOutput = TileCapacitorBank.getMethod("getMaxOutput"); + TCB_getMaxEnergyStored = TileCapacitorBank.getMethod("getMaxEnergyStored"); + TCB_getMaxIO = TileCapacitorBank.getMethod("getMaxIO"); + + TileTesseract = Class.forName("crazypants.enderio.machine.hypercube.TileHyperCube"); + + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e); + return; + } catch (NoSuchMethodException e) { + Waila.log.log(Level.WARN, "[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.WARN, "[EnderStorage] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().addConfig("EnderIO", "enderio.inout"); + ModuleRegistrar.instance().addConfig("EnderIO", "enderio.storage"); + ModuleRegistrar.instance().addConfig("EnderIO", "enderio.owner"); + ModuleRegistrar.instance().addConfig("EnderIO", "enderio.channel"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCapacitorBank); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerCapacitor(), TileCapacitorBank); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTesseract(), TileTesseract); + } - public static Class TileTesseract = null; - - public static void register(){ - try{ - Class ModClass = Class.forName("crazypants.enderio.EnderIO"); - Waila.log.log(Level.INFO, "EnderIO mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found."); - return; - } - - try{ - - TileCapacitorBank = Class.forName("crazypants.enderio.machine.power.TileCapacitorBank"); - TCB_getEnergyStored = TileCapacitorBank.getMethod("getEnergyStored"); - TCB_getMaxInput = TileCapacitorBank.getMethod("getMaxInput"); - TCB_getMaxOutput = TileCapacitorBank.getMethod("getMaxOutput"); - TCB_getMaxEnergyStored = TileCapacitorBank.getMethod("getMaxEnergyStored"); - TCB_getMaxIO = TileCapacitorBank.getMethod("getMaxIO"); - - TileTesseract = Class.forName("crazypants.enderio.machine.hypercube.TileHyperCube"); - - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e); - return; - } catch (NoSuchMethodException e){ - Waila.log.log(Level.WARN, "[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.WARN, "[EnderStorage] Unhandled exception." + e); - return; - } - - ModuleRegistrar.instance().addConfig("EnderIO", "enderio.inout"); - ModuleRegistrar.instance().addConfig("EnderIO", "enderio.storage"); - ModuleRegistrar.instance().addConfig("EnderIO", "enderio.owner"); - ModuleRegistrar.instance().addConfig("EnderIO", "enderio.channel"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCapacitorBank); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerCapacitor(), TileCapacitorBank); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTesseract(), TileTesseract); - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java index cbc9f1b..3f74e31 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java @@ -1,75 +1,107 @@ package mcp.mobius.waila.addons.enderio; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; +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; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; 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.WailaExceptionHandler; -import static mcp.mobius.waila.api.SpecialChars.*; -public class HUDHandlerCapacitor implements IWailaDataProvider{ +public class HUDHandlerCapacitor implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - - if (accessor.getPlayer().isSneaking()){ - try{ - - String maxIOStr = LangUtil.translateG("hud.msg.maxio"); - String inputStr = LangUtil.translateG("hud.msg.input"); - String outputStr = LangUtil.translateG("hud.msg.output"); - - if (config.getConfig("enderio.storage")){ - Integer maxEnergyStored = (Integer)EnderIOModule.TCB_getMaxEnergyStored.invoke(accessor.getTileEntity()); - Double energyStored = (Double)EnderIOModule.TCB_getEnergyStored.invoke(accessor.getTileEntity()); - currenttip.add(String.format("%s%.1f%s / %s%d%s RF", WHITE, energyStored * 10, RESET, WHITE, maxEnergyStored * 10, RESET)); - } - - if (config.getConfig("enderio.inout")){ - Integer maxIO = (Integer)EnderIOModule.TCB_getMaxIO.invoke(accessor.getTileEntity()); - Integer maxInput = (Integer)EnderIOModule.TCB_getMaxInput.invoke(accessor.getTileEntity()); - Integer maxOutput = (Integer)EnderIOModule.TCB_getMaxOutput.invoke(accessor.getTileEntity()); - currenttip.add(String.format("%s : %s%d%sRF/t ", maxIOStr, TAB + ALIGNRIGHT + WHITE, maxIO * 10, TAB + ALIGNRIGHT)); - currenttip.add(String.format("%s : %s%d%sRF/t ", inputStr, TAB + ALIGNRIGHT + WHITE, maxInput * 10, TAB + ALIGNRIGHT)); - currenttip.add(String.format("%s : %s%d%sRF/t ", outputStr,TAB + ALIGNRIGHT + WHITE, maxOutput * 10, TAB + ALIGNRIGHT)); - } - - - } catch (Exception e) { - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - } - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (accessor.getPlayer().isSneaking()) { + try { + + String maxIOStr = LangUtil.translateG("hud.msg.maxio"); + String inputStr = LangUtil.translateG("hud.msg.input"); + String outputStr = LangUtil.translateG("hud.msg.output"); + + if (config.getConfig("enderio.storage")) { + Integer maxEnergyStored = (Integer) EnderIOModule.TCB_getMaxEnergyStored + .invoke(accessor.getTileEntity()); + Double energyStored = (Double) EnderIOModule.TCB_getEnergyStored.invoke(accessor.getTileEntity()); + currenttip.add( + String.format( + "%s%.1f%s / %s%d%s RF", + WHITE, + energyStored * 10, + RESET, + WHITE, + maxEnergyStored * 10, + RESET)); + } + + if (config.getConfig("enderio.inout")) { + Integer maxIO = (Integer) EnderIOModule.TCB_getMaxIO.invoke(accessor.getTileEntity()); + Integer maxInput = (Integer) EnderIOModule.TCB_getMaxInput.invoke(accessor.getTileEntity()); + Integer maxOutput = (Integer) EnderIOModule.TCB_getMaxOutput.invoke(accessor.getTileEntity()); + currenttip.add( + String.format( + "%s : %s%d%sRF/t ", + maxIOStr, + TAB + ALIGNRIGHT + WHITE, + maxIO * 10, + TAB + ALIGNRIGHT)); + currenttip.add( + String.format( + "%s : %s%d%sRF/t ", + inputStr, + TAB + ALIGNRIGHT + WHITE, + maxInput * 10, + TAB + ALIGNRIGHT)); + currenttip.add( + String.format( + "%s : %s%d%sRF/t ", + outputStr, + TAB + ALIGNRIGHT + WHITE, + maxOutput * 10, + TAB + ALIGNRIGHT)); + } + + } catch (Exception e) { + currenttip = WailaExceptionHandler + .handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java index d507ca3..8ca60ed 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java @@ -1,79 +1,93 @@ package mcp.mobius.waila.addons.enderio; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -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 HUDHandlerTesseract implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - - if (accessor.getPlayer().isSneaking()){ - - String channel = "%s : %s%s%s %s"; - String freq; - String frequser; - String owner; - - if (config.getConfig("enderio.channel")){ - - if (accessor.getNBTData().hasKey("channelName")){ - freq = accessor.getNBTData().getString("channelName"); - - if (accessor.getNBTData().hasKey("channelUser")) - frequser = "[ " + WHITE + accessor.getNBTData().getString("channelUser") + RESET + " ]"; - else - frequser = "[ " + WHITE + LangUtil.translateG("hud.msg.public") + RESET +" ]"; - - } - else{ - freq = LangUtil.translateG("hud.msg.none"); - frequser = ""; - } - - currenttip.add(String.format(channel, LangUtil.translateG("hud.msg.frequency"), TAB + WHITE, freq, RESET, frequser)); - } - - if (config.getConfig("enderio.owner")){ - if (accessor.getNBTData().hasKey("owner")) - currenttip.add(String.format("%s : %s%s", LangUtil.translateG("hud.msg.owner"), TAB + WHITE, accessor.getNBTData().getString("owner"))); - } - - } - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (accessor.getPlayer().isSneaking()) { + + String channel = "%s : %s%s%s %s"; + String freq; + String frequser; + String owner; + + if (config.getConfig("enderio.channel")) { + + if (accessor.getNBTData().hasKey("channelName")) { + freq = accessor.getNBTData().getString("channelName"); + + if (accessor.getNBTData().hasKey("channelUser")) + frequser = "[ " + WHITE + accessor.getNBTData().getString("channelUser") + RESET + " ]"; + else frequser = "[ " + WHITE + LangUtil.translateG("hud.msg.public") + RESET + " ]"; + + } else { + freq = LangUtil.translateG("hud.msg.none"); + frequser = ""; + } + + currenttip.add( + String.format( + channel, + LangUtil.translateG("hud.msg.frequency"), + TAB + WHITE, + freq, + RESET, + frequser)); + } + + if (config.getConfig("enderio.owner")) { + if (accessor.getNBTData().hasKey("owner")) currenttip.add( + String.format( + "%s : %s%s", + LangUtil.translateG("hud.msg.owner"), + TAB + WHITE, + accessor.getNBTData().getString("owner"))); + } + + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java index 711b60d..b9ac7d0 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java +++ b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java @@ -3,56 +3,56 @@ package mcp.mobius.waila.addons.enderstorage; 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; +import org.apache.logging.log4j.Level; + public class EnderStorageModule { - public static Class TileFrequencyOwner = null; - public static Field TileFrequencyOwner_Freq = null; - - public static Class EnderStorageManager = null; - public static Method GetColourFromFreq = null; - - public static Class TileEnderTank = null; - - public static void register(){ - try{ - Class EnderStorage = Class.forName("codechicken.enderstorage.EnderStorage"); - Waila.log.log(Level.INFO, "EnderStorage mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found."); - return; - } - - try{ - - TileFrequencyOwner = Class.forName("codechicken.enderstorage.common.TileFrequencyOwner"); - TileFrequencyOwner_Freq = TileFrequencyOwner.getField("freq"); - - EnderStorageManager = Class.forName("codechicken.enderstorage.api.EnderStorageManager"); - GetColourFromFreq = EnderStorageManager.getDeclaredMethod("getColourFromFreq", Integer.TYPE, Integer.TYPE); - - TileEnderTank = Class.forName("codechicken.enderstorage.storage.liquid.TileEnderTank"); - - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e); - return; - } catch (NoSuchMethodException e){ - Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e); - return; - } catch (NoSuchFieldException e){ - Waila.log.log(Level.WARN, "[EnderStorage] Field not found." + e); - return; - } catch (Exception e){ - Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e); - return; - } - - ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(), TileFrequencyOwner); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerStorage(), TileFrequencyOwner); - } + public static Class TileFrequencyOwner = null; + public static Field TileFrequencyOwner_Freq = null; + + public static Class EnderStorageManager = null; + public static Method GetColourFromFreq = null; + + public static Class TileEnderTank = null; + + public static void register() { + try { + Class EnderStorage = Class.forName("codechicken.enderstorage.EnderStorage"); + Waila.log.log(Level.INFO, "EnderStorage mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found."); + return; + } + + try { + + TileFrequencyOwner = Class.forName("codechicken.enderstorage.common.TileFrequencyOwner"); + TileFrequencyOwner_Freq = TileFrequencyOwner.getField("freq"); + + EnderStorageManager = Class.forName("codechicken.enderstorage.api.EnderStorageManager"); + GetColourFromFreq = EnderStorageManager.getDeclaredMethod("getColourFromFreq", Integer.TYPE, Integer.TYPE); + + TileEnderTank = Class.forName("codechicken.enderstorage.storage.liquid.TileEnderTank"); + + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e); + return; + } catch (NoSuchMethodException e) { + Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e); + return; + } catch (NoSuchFieldException e) { + Waila.log.log(Level.WARN, "[EnderStorage] Field not found." + e); + return; + } catch (Exception e) { + Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(), TileFrequencyOwner); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerStorage(), TileFrequencyOwner); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java index f00c1ea..e6df47b 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java +++ b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java @@ -2,83 +2,75 @@ package mcp.mobius.waila.addons.enderstorage; import java.util.List; +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; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; 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.WailaExceptionHandler; public class HUDHandlerStorage implements IWailaDataProvider { - - private static String[] colors = { - LangUtil.translateG("hud.msg.white"), - LangUtil.translateG("hud.msg.orange"), - LangUtil.translateG("hud.msg.magenta"), - LangUtil.translateG("hud.msg.lblue"), - LangUtil.translateG("hud.msg.yellow"), - LangUtil.translateG("hud.msg.lime"), - LangUtil.translateG("hud.msg.pink"), - LangUtil.translateG("hud.msg.gray"), - LangUtil.translateG("hud.msg.lgray"), - LangUtil.translateG("hud.msg.cyan"), - LangUtil.translateG("hud.msg.purple"), - LangUtil.translateG("hud.msg.blue"), - LangUtil.translateG("hud.msg.brown"), - LangUtil.translateG("hud.msg.green"), - LangUtil.translateG("hud.msg.red"), - LangUtil.translateG("hud.msg.black") - }; - - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + private static String[] colors = { LangUtil.translateG("hud.msg.white"), LangUtil.translateG("hud.msg.orange"), + LangUtil.translateG("hud.msg.magenta"), LangUtil.translateG("hud.msg.lblue"), + LangUtil.translateG("hud.msg.yellow"), LangUtil.translateG("hud.msg.lime"), + LangUtil.translateG("hud.msg.pink"), LangUtil.translateG("hud.msg.gray"), + LangUtil.translateG("hud.msg.lgray"), LangUtil.translateG("hud.msg.cyan"), + LangUtil.translateG("hud.msg.purple"), LangUtil.translateG("hud.msg.blue"), + LangUtil.translateG("hud.msg.brown"), LangUtil.translateG("hud.msg.green"), + LangUtil.translateG("hud.msg.red"), LangUtil.translateG("hud.msg.black") }; - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if(config.getConfig("enderstorage.colors")){ - try{ - - int freq = EnderStorageModule.TileFrequencyOwner_Freq.getInt(accessor.getTileEntity()); - int freqLeft = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 0); - int freqCenter = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 1); - int freqRight = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 2); - - if (!EnderStorageModule.TileEnderTank.isInstance(accessor.getTileEntity())) - currenttip.add(String.format("%s/%s/%s", colors[freqLeft], colors[freqCenter], colors[freqRight])); - else - currenttip.add(String.format("%s/%s/%s", colors[freqRight], colors[freqCenter], colors[freqLeft])); - - - } catch (Exception e){ - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - - return currenttip; - } + @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("enderstorage.colors")) { + try { + + int freq = EnderStorageModule.TileFrequencyOwner_Freq.getInt(accessor.getTileEntity()); + int freqLeft = (Integer) EnderStorageModule.GetColourFromFreq.invoke(null, freq, 0); + int freqCenter = (Integer) EnderStorageModule.GetColourFromFreq.invoke(null, freq, 1); + int freqRight = (Integer) EnderStorageModule.GetColourFromFreq.invoke(null, freq, 2); + + if (!EnderStorageModule.TileEnderTank.isInstance(accessor.getTileEntity())) + currenttip.add(String.format("%s/%s/%s", colors[freqLeft], colors[freqCenter], colors[freqRight])); + else currenttip.add(String.format("%s/%s/%s", colors[freqRight], colors[freqCenter], colors[freqLeft])); + + } catch (Exception e) { + currenttip = WailaExceptionHandler + .handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } - - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java index 547d407..b67bbd9 100644 --- a/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java +++ b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java @@ -2,82 +2,79 @@ package mcp.mobius.waila.addons.etb; import java.lang.reflect.Field; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class ETBModule { - public static Class TileSocket = null; - public static Field Socket_sides = null; - public static Field Socket_configs = null; - //public static Field Socket_sideID = null; - //public static Field Socket_sideMeta = null; - //public static Field Socket_facID = null; - //public static Field Socket_facMeta = null; - - public static Class SocketsMod = null; - public static Field module = null; - - public static Class SideConfig = null; - public static Field SC_tank = null; - public static Field SC_inventory = null; - public static Field SC_rsControl = null; - public static Field SC_rsLatch = null; - - public static void register(){ - try{ - Class ModClass = Class.forName("emasher.sockets.TileSocket"); - Waila.log.log(Level.INFO, "Engineer Toolbox mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found."); - return; - } - - try{ - - TileSocket = Class.forName("emasher.sockets.TileSocket"); - Socket_sides = TileSocket.getField("sides"); - Socket_configs = TileSocket.getField("configs"); - //Socket_sideID = TileSocket.getField("sideID"); - //Socket_sideMeta = TileSocket.getField("sideMeta"); - //Socket_facID = TileSocket.getField("facID"); - //Socket_facMeta = TileSocket.getField("facMeta"); - - SocketsMod = Class.forName("emasher.sockets.SocketsMod"); - module = SocketsMod.getField("module"); - //module = (Item)SocketsMod.getField("module").get(null); - /* - if (module == null){ - mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] module field is null !"); - return; - } - */ - - SideConfig = Class.forName("emasher.api.SideConfig"); - SC_tank = SideConfig.getField("tank"); - SC_inventory = SideConfig.getField("inventory"); - SC_rsControl = SideConfig.getField("rsControl"); - SC_rsLatch = SideConfig.getField("rsLatch"); - - - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[Engineer Toolbox] Class not found. " + e); - return; -// } catch (NoSuchMethodException e){ -// Waila.log.log(Level.WARN, "[Engineer Toolbox] Method not found." + e); -// return; - } catch (NoSuchFieldException e){ - Waila.log.log(Level.WARN, "[Engineer Toolbox] Field not found." + e); - return; - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Engineer Toolbox] Unhandled exception." + e); - return; - } - - ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerSocket(), TileSocket); - } + public static Class TileSocket = null; + public static Field Socket_sides = null; + public static Field Socket_configs = null; + // public static Field Socket_sideID = null; + // public static Field Socket_sideMeta = null; + // public static Field Socket_facID = null; + // public static Field Socket_facMeta = null; + + public static Class SocketsMod = null; + public static Field module = null; + + public static Class SideConfig = null; + public static Field SC_tank = null; + public static Field SC_inventory = null; + public static Field SC_rsControl = null; + public static Field SC_rsLatch = null; + + public static void register() { + try { + Class ModClass = Class.forName("emasher.sockets.TileSocket"); + Waila.log.log(Level.INFO, "Engineer Toolbox mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found."); + return; + } + + try { + + TileSocket = Class.forName("emasher.sockets.TileSocket"); + Socket_sides = TileSocket.getField("sides"); + Socket_configs = TileSocket.getField("configs"); + // Socket_sideID = TileSocket.getField("sideID"); + // Socket_sideMeta = TileSocket.getField("sideMeta"); + // Socket_facID = TileSocket.getField("facID"); + // Socket_facMeta = TileSocket.getField("facMeta"); + + SocketsMod = Class.forName("emasher.sockets.SocketsMod"); + module = SocketsMod.getField("module"); + // module = (Item)SocketsMod.getField("module").get(null); + /* + * if (module == null){ mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] module field is null !"); + * return; } + */ + + SideConfig = Class.forName("emasher.api.SideConfig"); + SC_tank = SideConfig.getField("tank"); + SC_inventory = SideConfig.getField("inventory"); + SC_rsControl = SideConfig.getField("rsControl"); + SC_rsLatch = SideConfig.getField("rsLatch"); + + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[Engineer Toolbox] Class not found. " + e); + return; + // } catch (NoSuchMethodException e){ + // Waila.log.log(Level.WARN, "[Engineer Toolbox] Method not found." + e); + // return; + } catch (NoSuchFieldException e) { + Waila.log.log(Level.WARN, "[Engineer Toolbox] Field not found." + e); + return; + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Engineer Toolbox] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerSocket(), TileSocket); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java index bb940fe..a859cbe 100644 --- a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java +++ b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java @@ -2,6 +2,11 @@ package mcp.mobius.waila.addons.etb; import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,106 +14,96 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.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 { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("etb.displaydata")) return currenttip; - - try { - int[] sides = (int[])ETBModule.Socket_sides.get(accessor.getTileEntity()); - Object[] configs = (Object[])ETBModule.Socket_configs.get(accessor.getTileEntity()); - Item module = (Item)ETBModule.module.get(null); - - - for( int s = 0; s < 6; s++){ - if (sides[s] != 0){ - - int tank = (Integer)ETBModule.SC_tank.get(configs[s]); - int inventory = (Integer)ETBModule.SC_inventory.get(configs[s]); - boolean[] rsControl = (boolean[])ETBModule.SC_rsControl.get(configs[s]); - boolean[] rsLatch = (boolean[])ETBModule.SC_rsLatch.get(configs[s]); - - - ItemStack stack = new ItemStack(module, 1, sides[s]); - String tipstr = String.format("%-5s : %s ", ForgeDirection.getOrientation(s), stack.getDisplayName()); - - String configstr = "[ "; - - if (tank != -1) - configstr += "\u00a79" + String.valueOf(tank) + " "; + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("etb.displaydata")) return currenttip; - if (inventory != -1) - configstr += "\u00a7a" + String.valueOf(inventory) + " "; - - if (rsControl[0] || rsControl[1] || rsControl[2]){ - configstr += "\u00a7c"; - configstr += rsControl[0] ? "1" : "0"; - configstr += rsControl[1] ? "1" : "0"; - configstr += rsControl[2] ? "1" : "0"; - configstr += " "; - } + try { + int[] sides = (int[]) ETBModule.Socket_sides.get(accessor.getTileEntity()); + Object[] configs = (Object[]) ETBModule.Socket_configs.get(accessor.getTileEntity()); + Item module = (Item) ETBModule.module.get(null); - if (rsLatch[0] || rsLatch[1] || rsLatch[2]){ - configstr += "\u00a75"; - configstr += rsLatch[0] ? "1" : "0"; - configstr += rsLatch[1] ? "1" : "0"; - configstr += rsLatch[2] ? "1" : "0"; - configstr += " "; - } - - configstr += "\u00a7r]"; - - if (!configstr.equals("[ \u00a7r]")) - tipstr += " " + configstr; - - /* - if ((tank != -1) && (inventory != -1)) - tipstr += String.format("[ \u00a79%d \u00a7a%d \u00a7r]", tank, inventory); - else if (tank != -1) - tipstr += String.format("[ \u00a79%d \u00a7r]", tank); - else if (inventory != -1) - tipstr += String.format("[ \u00a7a%d \u00a7r]", inventory); - */ - - currenttip.add(tipstr); - } - } - - - - } catch (Exception e) { - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - return currenttip; - } + for (int s = 0; s < 6; s++) { + if (sides[s] != 0) { - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + int tank = (Integer) ETBModule.SC_tank.get(configs[s]); + int inventory = (Integer) ETBModule.SC_inventory.get(configs[s]); + boolean[] rsControl = (boolean[]) ETBModule.SC_rsControl.get(configs[s]); + boolean[] rsLatch = (boolean[]) ETBModule.SC_rsLatch.get(configs[s]); + + ItemStack stack = new ItemStack(module, 1, sides[s]); + String tipstr = String + .format("%-5s : %s ", ForgeDirection.getOrientation(s), stack.getDisplayName()); + + String configstr = "[ "; + + if (tank != -1) configstr += "\u00a79" + String.valueOf(tank) + " "; + + if (inventory != -1) configstr += "\u00a7a" + String.valueOf(inventory) + " "; + + if (rsControl[0] || rsControl[1] || rsControl[2]) { + configstr += "\u00a7c"; + configstr += rsControl[0] ? "1" : "0"; + configstr += rsControl[1] ? "1" : "0"; + configstr += rsControl[2] ? "1" : "0"; + configstr += " "; + } + + if (rsLatch[0] || rsLatch[1] || rsLatch[2]) { + configstr += "\u00a75"; + configstr += rsLatch[0] ? "1" : "0"; + configstr += rsLatch[1] ? "1" : "0"; + configstr += rsLatch[2] ? "1" : "0"; + configstr += " "; + } + + configstr += "\u00a7r]"; + + if (!configstr.equals("[ \u00a7r]")) tipstr += " " + configstr; + + /* + * if ((tank != -1) && (inventory != -1)) tipstr += String.format("[ \u00a79%d \u00a7a%d \u00a7r]", + * tank, inventory); else if (tank != -1) tipstr += String.format("[ \u00a79%d \u00a7r]", tank); + * else if (inventory != -1) tipstr += String.format("[ \u00a7a%d \u00a7r]", inventory); + */ + + currenttip.add(tipstr); + } + } + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java index 1799f9e..e25e56f 100644 --- a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java +++ b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java @@ -1,35 +1,34 @@ package mcp.mobius.waila.addons.exu; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class ExtraUtilitiesModule { - public static Class ModExtraUtilities = null; - public static Class TileEntityDrum = null; - - public static void register(){ - + public static Class ModExtraUtilities = null; + public static Class TileEntityDrum = null; - try{ - Class ModExtraUtilities = Class.forName("com.rwtema.extrautils.ExtraUtils"); - Waila.log.log(Level.INFO, "ExtraUtilities mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found."); - return; - } - - try{ - TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum"); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[ExtraUtilities] Class not found. " + e); - return; - } - - ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(), TileEntityDrum); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerDrum(), TileEntityDrum); - } + public static void register() { + + try { + Class ModExtraUtilities = Class.forName("com.rwtema.extrautils.ExtraUtils"); + Waila.log.log(Level.INFO, "ExtraUtilities mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found."); + return; + } + + try { + TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum"); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[ExtraUtilities] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(), TileEntityDrum); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDrum(), TileEntityDrum); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java index fc051ad..8938cca 100644 --- a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java +++ b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java @@ -2,6 +2,10 @@ package mcp.mobius.waila.addons.exu; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,54 +14,53 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; 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; public class HUDHandlerDrum implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("extrautilities.fluidamount")) return currenttip; - - int amount = 0; - - NBTTagCompound subtag = accessor.getNBTData().getCompoundTag("tank"); - if (subtag.hasKey("Amount")) - amount = accessor.getNBTInteger(subtag, "Amount"); - - IFluidHandler handler = (IFluidHandler)accessor.getTileEntity(); - if (handler == null) return currenttip; - - FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); - if (tanks.length != 1) return currenttip; - - currenttip.add(String.format("%d / %d mB", amount, tanks[0].capacity)); - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (!config.getConfig("extrautilities.fluidamount")) return currenttip; + + int amount = 0; + + NBTTagCompound subtag = accessor.getNBTData().getCompoundTag("tank"); + if (subtag.hasKey("Amount")) amount = accessor.getNBTInteger(subtag, "Amount"); + + IFluidHandler handler = (IFluidHandler) accessor.getTileEntity(); + if (handler == null) return currenttip; + + FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); + if (tanks.length != 1) return currenttip; + + currenttip.add(String.format("%d / %d mB", amount, tanks[0].capacity)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java index 39a784e..0639557 100644 --- a/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java +++ b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java @@ -1,33 +1,32 @@ package mcp.mobius.waila.addons.gravestone; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class GravestoneModule { - public static Class BlockGraveStone = null; - - public static void register(){ + public static Class BlockGraveStone = null; - try{ - Class ModGravestone = Class.forName("GraveStone.ModGraveStone"); - Waila.log.log(Level.INFO, "GraveStone mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found."); - return; - } + public static void register() { - try { - BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone"); - } catch (ClassNotFoundException e) { - Waila.log.log(Level.WARN, "[GraveStone] Class not found. " + e); - } + try { + Class ModGravestone = Class.forName("GraveStone.ModGraveStone"); + Waila.log.log(Level.INFO, "GraveStone mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found."); + return; + } - - ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerGravestone(), BlockGraveStone); - } + try { + BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone"); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[GraveStone] Class not found. " + e); + } + + ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerGravestone(), BlockGraveStone); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java index 41352c7..e721872 100644 --- a/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java +++ b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java @@ -2,42 +2,46 @@ package mcp.mobius.waila.addons.gravestone; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; public class HUDHandlerGravestone implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata()); - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata()); + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @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) { - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } - - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java index ed9fcfc..306ba7f 100644 --- a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java +++ b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java @@ -2,54 +2,58 @@ package mcp.mobius.waila.addons.harvestcraft; import java.util.List; +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.NBTUtil; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; 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; public class HUDHandlerPamCrop implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("general.showcrop")) return currenttip; - - int growthStage = NBTUtil.getNBTInteger(accessor.getNBTData(), "growthStage"); + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("general.showcrop")) return currenttip; - 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; + 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java index e21b385..06f0fc3 100644 --- a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java @@ -1,30 +1,30 @@ package mcp.mobius.waila.addons.harvestcraft; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -public class HarvestcraftModule { - public static Class TileEntityPamCrop = null; +import org.apache.logging.log4j.Level; - - 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.WARN, "[PamHarvestCraft] Class not found. " + e); - return; - } - - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerPamCrop(), TileEntityPamCrop); - } +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.WARN, "[PamHarvestCraft] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerPamCrop(), TileEntityPamCrop); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java index c44d80a..3b63253 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java @@ -1,111 +1,122 @@ package mcp.mobius.waila.addons.ic2; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; 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.api.impl.ConfigHandler; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; -import static mcp.mobius.waila.api.SpecialChars.*; public class HUDHandlerTEGenerator implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - try{ - double storage = accessor.getNBTData().getDouble("storage"); - int production = accessor.getNBTData().getInteger("production"); - long maxStorage = accessor.getNBTData().getLong("maxStorage"); - - String storedStr = LangUtil.translateG("hud.msg.stored"); - String outputStr = LangUtil.translateG("hud.msg.output"); - - /* EU Storage */ - if (ConfigHandler.instance().getConfig("ic2.storage")){ - if (maxStorage > 0) - currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(storage,maxStorage)), maxStorage)); - } - - if (ConfigHandler.instance().getConfig("ic2.outputeu")){ - currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production)); - } - - } catch (Exception e){ - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + try { + double storage = accessor.getNBTData().getDouble("storage"); + int production = accessor.getNBTData().getInteger("production"); + long maxStorage = accessor.getNBTData().getLong("maxStorage"); - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + String storedStr = LangUtil.translateG("hud.msg.stored"); + String outputStr = LangUtil.translateG("hud.msg.output"); - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - - try{ - double storage = -1; - long production = -1; - long maxStorage = -1; - - if (IC2Module.TileBaseGenerator.isInstance(te)){ - storage = IC2Module.TileBaseGenerator_storage.getDouble(te); - production = (long)IC2Module.TileBaseGenerator_production.getInt(te); - maxStorage = (long)IC2Module.TileBaseGenerator_maxStorage.getShort(te); - } + /* EU Storage */ + if (ConfigHandler.instance().getConfig("ic2.storage")) { + if (maxStorage > 0) currenttip.add( + String.format( + "%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", + storedStr, + TAB + ALIGNRIGHT, + Math.round(Math.min(storage, maxStorage)), + maxStorage)); + } - else if (IC2Module.TileGeoGenerator.isInstance(te)){ - storage = IC2Module.TileGeoGenerator_storage.getDouble(te); - production = (long)IC2Module.TileGeoGenerator_production.getInt(te); - maxStorage = (long)IC2Module.TileGeoGenerator_maxStorage.getShort(te); - } - - else if (IC2Module.TileKineticGenerator.isInstance(te)){ - storage = IC2Module.TileKineticGenerator_storage.getDouble(te); - production = MathHelper.floor_double_long(IC2Module.TileKineticGenerator_production.getDouble(te)); - maxStorage = (long)IC2Module.TileKineticGenerator_maxStorage.getInt(te); - } - - else if (IC2Module.TileSemifluidGenerator.isInstance(te)){ - storage = IC2Module.TileSemifluidGenerator_storage.getDouble(te); - production = MathHelper.floor_double_long(IC2Module.TileSemifluidGenerator_production.getDouble(te)); - maxStorage = (long)IC2Module.TileSemifluidGenerator_maxStorage.getShort(te); - } - - else if (IC2Module.TileStirlingGenerator.isInstance(te)){ - storage = IC2Module.TileStirlingGenerator_storage.getDouble(te); - production = MathHelper.floor_double_long(IC2Module.TileStirlingGenerator_production.getDouble(te)); - maxStorage = (long)IC2Module.TileStirlingGenerator_maxStorage.getShort(te); - } - - tag.setDouble ("storage", storage); - tag.setLong ("production", production); - tag.setLong ("maxStorage", maxStorage); - - } catch (Exception e){ - throw new RuntimeException(e); - } - return tag; - } + if (ConfigHandler.instance().getConfig("ic2.outputeu")) { + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production)); + } + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + + try { + double storage = -1; + long production = -1; + long maxStorage = -1; + + if (IC2Module.TileBaseGenerator.isInstance(te)) { + storage = IC2Module.TileBaseGenerator_storage.getDouble(te); + production = (long) IC2Module.TileBaseGenerator_production.getInt(te); + maxStorage = (long) IC2Module.TileBaseGenerator_maxStorage.getShort(te); + } + + else if (IC2Module.TileGeoGenerator.isInstance(te)) { + storage = IC2Module.TileGeoGenerator_storage.getDouble(te); + production = (long) IC2Module.TileGeoGenerator_production.getInt(te); + maxStorage = (long) IC2Module.TileGeoGenerator_maxStorage.getShort(te); + } + + else if (IC2Module.TileKineticGenerator.isInstance(te)) { + storage = IC2Module.TileKineticGenerator_storage.getDouble(te); + production = MathHelper.floor_double_long(IC2Module.TileKineticGenerator_production.getDouble(te)); + maxStorage = (long) IC2Module.TileKineticGenerator_maxStorage.getInt(te); + } + + else if (IC2Module.TileSemifluidGenerator.isInstance(te)) { + storage = IC2Module.TileSemifluidGenerator_storage.getDouble(te); + production = MathHelper.floor_double_long(IC2Module.TileSemifluidGenerator_production.getDouble(te)); + maxStorage = (long) IC2Module.TileSemifluidGenerator_maxStorage.getShort(te); + } + + else if (IC2Module.TileStirlingGenerator.isInstance(te)) { + storage = IC2Module.TileStirlingGenerator_storage.getDouble(te); + production = MathHelper.floor_double_long(IC2Module.TileStirlingGenerator_production.getDouble(te)); + maxStorage = (long) IC2Module.TileStirlingGenerator_maxStorage.getShort(te); + } + + tag.setDouble("storage", storage); + tag.setLong("production", production); + tag.setLong("maxStorage", maxStorage); + + } catch (Exception e) { + throw new RuntimeException(e); + } + return tag; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java index 53d357c..79bb37f 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java @@ -1,91 +1,92 @@ package mcp.mobius.waila.addons.ic2; import java.lang.reflect.Field; -import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class IC2Module { - public static Class TileBaseGenerator = null; - public static Field TileBaseGenerator_storage = null; - public static Field TileBaseGenerator_maxStorage = null; - public static Field TileBaseGenerator_production = null; - - public static Class TileGeoGenerator = null; - public static Field TileGeoGenerator_storage = null; - public static Field TileGeoGenerator_maxStorage = null; - public static Field TileGeoGenerator_production = null; + public static Class TileBaseGenerator = null; + public static Field TileBaseGenerator_storage = null; + public static Field TileBaseGenerator_maxStorage = null; + public static Field TileBaseGenerator_production = null; - public static Class TileKineticGenerator = null; - public static Field TileKineticGenerator_storage = null; - public static Field TileKineticGenerator_maxStorage = null; - public static Field TileKineticGenerator_production = null; - - public static Class TileSemifluidGenerator = null; - public static Field TileSemifluidGenerator_storage = null; - public static Field TileSemifluidGenerator_maxStorage = null; - public static Field TileSemifluidGenerator_production = null; - - public static Class TileStirlingGenerator = null; - public static Field TileStirlingGenerator_storage = null; - public static Field TileStirlingGenerator_maxStorage = null; - public static Field TileStirlingGenerator_production = null; - - public static void register(){ - // XXX : We register the Energy interface first - try{ - TileBaseGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator"); - TileBaseGenerator_storage = TileBaseGenerator.getDeclaredField("storage"); - TileBaseGenerator_maxStorage = TileBaseGenerator.getDeclaredField("maxStorage"); - TileBaseGenerator_production = TileBaseGenerator.getDeclaredField("production"); + public static Class TileGeoGenerator = null; + public static Field TileGeoGenerator_storage = null; + public static Field TileGeoGenerator_maxStorage = null; + public static Field TileGeoGenerator_production = null; + + public static Class TileKineticGenerator = null; + public static Field TileKineticGenerator_storage = null; + public static Field TileKineticGenerator_maxStorage = null; + public static Field TileKineticGenerator_production = null; + + public static Class TileSemifluidGenerator = null; + public static Field TileSemifluidGenerator_storage = null; + public static Field TileSemifluidGenerator_maxStorage = null; + public static Field TileSemifluidGenerator_production = null; + + public static Class TileStirlingGenerator = null; + public static Field TileStirlingGenerator_storage = null; + public static Field TileStirlingGenerator_maxStorage = null; + public static Field TileStirlingGenerator_production = null; + + public static void register() { + // XXX : We register the Energy interface first + try { + TileBaseGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator"); + TileBaseGenerator_storage = TileBaseGenerator.getDeclaredField("storage"); + TileBaseGenerator_maxStorage = TileBaseGenerator.getDeclaredField("maxStorage"); + TileBaseGenerator_production = TileBaseGenerator.getDeclaredField("production"); + + TileGeoGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator"); + TileGeoGenerator_storage = TileGeoGenerator.getDeclaredField("storage"); + TileGeoGenerator_maxStorage = TileGeoGenerator.getDeclaredField("maxStorage"); + TileGeoGenerator_production = TileGeoGenerator.getDeclaredField("production"); + + TileKineticGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityKineticGenerator"); + TileKineticGenerator_storage = TileKineticGenerator.getDeclaredField("EUstorage"); + TileKineticGenerator_maxStorage = TileKineticGenerator.getDeclaredField("maxEUStorage"); + TileKineticGenerator_production = TileKineticGenerator.getDeclaredField("production"); + TileKineticGenerator_storage.setAccessible(true); + TileKineticGenerator_maxStorage.setAccessible(true); + TileKineticGenerator_production.setAccessible(true); + + TileSemifluidGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator"); + TileSemifluidGenerator_storage = TileSemifluidGenerator.getDeclaredField("storage"); + TileSemifluidGenerator_maxStorage = TileSemifluidGenerator.getDeclaredField("maxStorage"); + TileSemifluidGenerator_production = TileSemifluidGenerator.getDeclaredField("production"); + TileSemifluidGenerator_storage.setAccessible(true); + TileSemifluidGenerator_maxStorage.setAccessible(true); + TileSemifluidGenerator_production.setAccessible(true); + + TileStirlingGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityStirlingGenerator"); + TileStirlingGenerator_storage = TileStirlingGenerator.getDeclaredField("EUstorage"); + TileStirlingGenerator_maxStorage = TileStirlingGenerator.getDeclaredField("maxEUStorage"); + TileStirlingGenerator_production = TileStirlingGenerator.getDeclaredField("production"); + + // ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileBaseGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileGeoGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileKineticGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileSemifluidGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileStirlingGenerator); + + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileBaseGenerator); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileGeoGenerator); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileKineticGenerator); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileSemifluidGenerator); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileStirlingGenerator); + + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.outputeu"); + + } catch (Exception e) { + Waila.log.log(Level.WARN, "[IndustrialCraft 2] Error while loading generator hooks." + e); + } + } - TileGeoGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator"); - TileGeoGenerator_storage = TileGeoGenerator.getDeclaredField("storage"); - TileGeoGenerator_maxStorage = TileGeoGenerator.getDeclaredField("maxStorage"); - TileGeoGenerator_production = TileGeoGenerator.getDeclaredField("production"); - - TileKineticGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityKineticGenerator"); - TileKineticGenerator_storage = TileKineticGenerator.getDeclaredField("EUstorage"); - TileKineticGenerator_maxStorage = TileKineticGenerator.getDeclaredField("maxEUStorage"); - TileKineticGenerator_production = TileKineticGenerator.getDeclaredField("production"); - TileKineticGenerator_storage.setAccessible(true); - TileKineticGenerator_maxStorage.setAccessible(true); - TileKineticGenerator_production.setAccessible(true); - - TileSemifluidGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator"); - TileSemifluidGenerator_storage = TileSemifluidGenerator.getDeclaredField("storage"); - TileSemifluidGenerator_maxStorage = TileSemifluidGenerator.getDeclaredField("maxStorage"); - TileSemifluidGenerator_production = TileSemifluidGenerator.getDeclaredField("production"); - TileSemifluidGenerator_storage.setAccessible(true); - TileSemifluidGenerator_maxStorage.setAccessible(true); - TileSemifluidGenerator_production.setAccessible(true); - - TileStirlingGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityStirlingGenerator"); - TileStirlingGenerator_storage = TileStirlingGenerator.getDeclaredField("EUstorage"); - TileStirlingGenerator_maxStorage = TileStirlingGenerator.getDeclaredField("maxEUStorage"); - TileStirlingGenerator_production = TileStirlingGenerator.getDeclaredField("production"); - - //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileBaseGenerator); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileGeoGenerator); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileKineticGenerator); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileSemifluidGenerator); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileStirlingGenerator); - - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileBaseGenerator); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileGeoGenerator); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileKineticGenerator); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileSemifluidGenerator); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileStirlingGenerator); - - ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage"); - ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.outputeu"); - - } catch (Exception e){ - Waila.log.log(Level.WARN, "[IndustrialCraft 2] Error while loading generator hooks." + e); - } - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java index e5c3fa0..a1372a8 100644 --- a/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java +++ b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java @@ -2,52 +2,56 @@ package mcp.mobius.waila.addons.magicalcrops; import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; public class HUDHandlerMagicalCrops implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("general.showcrop")) return currenttip; - - int growthStage = accessor.getMetadata(); + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("general.showcrop")) return currenttip; - 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; - } + int growthStage = accessor.getMetadata(); - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java index a9a73fc..0584269 100644 --- a/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java @@ -1,30 +1,30 @@ package mcp.mobius.waila.addons.magicalcrops; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -public class MagicalCropsModule { - public static Class BlockMagicalCrops = null; +import org.apache.logging.log4j.Level; - - 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.WARN, "[MagicalCrops] Class not found. " + e); - return; - } - - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerMagicalCrops(), BlockMagicalCrops); - } +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.WARN, "[MagicalCrops] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerMagicalCrops(), BlockMagicalCrops); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java index 9996788..4c29b90 100644 --- a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java @@ -2,6 +2,11 @@ package mcp.mobius.waila.addons.openblocks; import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,70 +16,68 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; public class HUDHandlerTank implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("openblocks.fluidamount")) return currenttip; - - IFluidHandler handler = (IFluidHandler)accessor.getTileEntity(); - if (handler == null) return currenttip; - - FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); - if (tanks.length != 1) return currenttip; - - FluidStack fluid = tanks[0].fluid; - String name = currenttip.get(0); - - try{ - name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); - } catch (NullPointerException f){ - name += " " + LangUtil.translateG("hud.msg.empty"); - } - - currenttip.set(0, name); - - return currenttip; - } + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("openblocks.fluidamount")) return currenttip; - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("openblocks.fluidamount")) return currenttip; - - IFluidHandler handler = (IFluidHandler)accessor.getTileEntity(); - if (handler == null) return currenttip; - - FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); - if (tanks.length != 1) return currenttip; - - if(tanks[0].fluid != null) - currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity)); - else - currenttip.add(String.format("0 / %d mB", tanks[0].capacity)); - - return currenttip; - } + IFluidHandler handler = (IFluidHandler) accessor.getTileEntity(); + if (handler == null) return currenttip; - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); + if (tanks.length != 1) return currenttip; + + FluidStack fluid = tanks[0].fluid; + String name = currenttip.get(0); + + try { + name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); + } catch (NullPointerException f) { + name += " " + LangUtil.translateG("hud.msg.empty"); + } + + currenttip.set(0, name); + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("openblocks.fluidamount")) return currenttip; + + IFluidHandler handler = (IFluidHandler) accessor.getTileEntity(); + if (handler == null) return currenttip; + + FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); + if (tanks.length != 1) return currenttip; + + if (tanks[0].fluid != null) + currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity)); + else currenttip.add(String.format("0 / %d mB", tanks[0].capacity)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java index 37f8d31..2a09db8 100644 --- a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java @@ -1,34 +1,34 @@ package mcp.mobius.waila.addons.openblocks; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class OpenBlocksModule { - - public static Class ModOpenBlocks = null; - public static Class TileEntityTank = null; - - public static void register(){ - try{ - Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks"); - Waila.log.log(Level.INFO, "OpenBlocks mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found."); - return; - } - - try{ - TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank"); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[OpenBlocks] Class not found. " + e); - return; - } - - ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileEntityTank); - } + + public static Class ModOpenBlocks = null; + public static Class TileEntityTank = null; + + public static void register() { + try { + Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks"); + Waila.log.log(Level.INFO, "OpenBlocks mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found."); + return; + } + + try { + TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank"); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[OpenBlocks] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank); + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileEntityTank); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java index c21fa2a..e6e88b7 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java @@ -1,210 +1,331 @@ package mcp.mobius.waila.addons.projectred; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; import mcp.mobius.waila.api.IWailaConfigHandler; 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; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + 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 */, - {1,1,2,1} /* NAND */, {0,1,2,1} /* XOR */, {0,1,2,1} /* XNOR */, {1,2,2,2} /* Buf */, - {3,4,2,5} /* Multi */, {1,0,2,0} /* Pulse */, {1,0,2,0} /* Repeat */, {1,2,2,2} /* Rand */, - {2,1,2,1} /* Latch */, {2,1,2,1} /* Toggle*/, {6,1,2,2} /* Transp */, {2,0,0,0} /* Light */, - {2,0,0,0} /* Rain */, {1,7,2,7} /* Timer */, {2,2,2,2} /* Sequen */, {2,9,2,8} /* Count */, - {1,2,2,6} /* State */, {6,1,2,1} /* Sync */, {10,1,10,1} /* Bus */, {11,12,11,12} /* Null */, - {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, IWailaFMPAccessor accessor, IWailaConfigHandler config) { + static byte[][] IOARRAY = { { 1, 1, 2, 1 } /* OR */, { 1, 1, 2, 1 } /* NOR */, { 1, 2, 2, 2 } /* NOT */, + { 1, 1, 2, 1 } /* AND */, { 1, 1, 2, 1 } /* NAND */, { 0, 1, 2, 1 } /* XOR */, { 0, 1, 2, 1 } /* XNOR */, + { 1, 2, 2, 2 } /* Buf */, { 3, 4, 2, 5 } /* Multi */, { 1, 0, 2, 0 } /* Pulse */, + { 1, 0, 2, 0 } /* Repeat */, { 1, 2, 2, 2 } /* Rand */, { 2, 1, 2, 1 } /* Latch */, + { 2, 1, 2, 1 } /* Toggle */, { 6, 1, 2, 2 } /* Transp */, { 2, 0, 0, 0 } /* Light */, + { 2, 0, 0, 0 } /* Rain */, { 1, 7, 2, 7 } /* Timer */, { 2, 2, 2, 2 } /* Sequen */, + { 2, 9, 2, 8 } /* Count */, { 1, 2, 2, 6 } /* State */, { 6, 1, 2, 1 } /* Sync */, + { 10, 1, 10, 1 } /* Bus */, { 11, 12, 11, 12 } /* Null */, { 11, 12, 11, 12 } /* Inver */, + { 11, 12, 11, 12 } /* Buff */, { 1, 9, 2, 8 } /* Cmp */, { 1, 12, 2, 12 } /* And */, }; - if (!config.getConfig("pr.showio")) return; - - - int orient = 0; - int subID = 0; - int shape = 0; - - orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient"); - subID = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID"); - shape = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape"); - - //orient = orient - ((orient & 0x10) + (orient & 0x8) + (orient & 0x4)); - int hOrient = orient & 0x3; - ForgeDirection vOrient = ForgeDirection.getOrientation((orient - (orient & 0x3)) >> 2); - - //System.out.printf("%s\n", ForgeDirection.getOrientation(vOrient)); - - if (vOrient == ForgeDirection.EAST) - hOrient -= 1; + 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, IWailaFMPAccessor accessor, IWailaConfigHandler config) { + + if (!config.getConfig("pr.showio")) return; + + int orient = 0; + int subID = 0; + int shape = 0; + + orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient"); + subID = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID"); + shape = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape"); + + // orient = orient - ((orient & 0x10) + (orient & 0x8) + (orient & 0x4)); + int hOrient = orient & 0x3; + ForgeDirection vOrient = ForgeDirection.getOrientation((orient - (orient & 0x3)) >> 2); + + // System.out.printf("%s\n", ForgeDirection.getOrientation(vOrient)); + + if (vOrient == ForgeDirection.EAST) hOrient -= 1; + + if (vOrient == ForgeDirection.WEST) hOrient += 1; + + if (hOrient == -1) hOrient = 3; + + String[] IOStr = new String[4]; + 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]; + + for (int i = 0; i < 4; i++) { + int j = i + hOrient; + if (j >= 4) j -= 4; + IOStrRot[j] = IOStr[i]; + } + + switch (vOrient) { + case DOWN: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 0.2F, 1.4F, 90F, 0F, 0F); // Orient + // 0 + UIHelper.drawFloatingText( + IOStrRot[1], + accessor.getRenderingPosition(), + -0.4F, + 0.2F, + 0.5F, + 90F, + 270F, + 0F); // Orient 1 + UIHelper.drawFloatingText( + IOStrRot[2], + accessor.getRenderingPosition(), + 0.5F, + 0.2F, + -0.4F, + 90F, + 180F, + 0F); // Orient 2 + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 1.4F, 0.2F, 0.5F, 90F, 90F, 0F); // Orient + // 3 + break; + case EAST: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.8F, 0.5F, 1.4F, 0F, 90F, 90F); + UIHelper.drawFloatingText( + IOStrRot[1], + accessor.getRenderingPosition(), + 0.8F, + -0.4F, + 0.5F, + 0F, + 90F, + 180F); + UIHelper.drawFloatingText( + IOStrRot[2], + accessor.getRenderingPosition(), + 0.8F, + 0.5F, + -0.4F, + 0F, + 90F, + 270F); + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 0.8F, 1.4F, 0.5F, 0F, 90F, 0F); + break; + case NORTH: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 1.4F, 0.2F, 0F, 180F, 0F); + UIHelper.drawFloatingText( + IOStrRot[1], + accessor.getRenderingPosition(), + 1.4F, + 0.5F, + 0.2F, + 0F, + 180F, + 90F); + UIHelper.drawFloatingText( + IOStrRot[2], + accessor.getRenderingPosition(), + 0.5F, + -0.4F, + 0.2F, + 0F, + 180F, + 180F); + UIHelper.drawFloatingText( + IOStrRot[3], + accessor.getRenderingPosition(), + -0.4F, + 0.5F, + 0.2F, + 0F, + 180F, + 270F); + break; + case SOUTH: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 1.4F, 0.8F, 0F, 0F, 0F); + UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), -0.4F, 0.5F, 0.8F, 0F, 0F, 90F); + UIHelper.drawFloatingText( + IOStrRot[2], + accessor.getRenderingPosition(), + 0.5F, + -0.4F, + 0.8F, + 0F, + 0F, + 180F); + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 1.4F, 0.5F, 0.8F, 0F, 0F, 270F); + break; + case UP: + UIHelper.drawFloatingText( + IOStrRot[0], + accessor.getRenderingPosition(), + 0.5F, + 0.8F, + 1.4F, + 270F, + 180F, + 0F); + UIHelper.drawFloatingText( + IOStrRot[1], + accessor.getRenderingPosition(), + 1.4F, + 0.8F, + 0.5F, + 270F, + 270F, + 0F); + UIHelper.drawFloatingText( + IOStrRot[2], + accessor.getRenderingPosition(), + 0.5F, + 0.8F, + -0.4F, + 270F, + 0F, + 0F); + UIHelper.drawFloatingText( + IOStrRot[3], + accessor.getRenderingPosition(), + -0.4F, + 0.8F, + 0.5F, + 270F, + 90F, + 0F); + break; + case WEST: + UIHelper.drawFloatingText( + IOStrRot[0], + accessor.getRenderingPosition(), + 0.2F, + 0.5F, + 1.4F, + 180F, + 90F, + 90F); + UIHelper.drawFloatingText( + IOStrRot[1], + accessor.getRenderingPosition(), + 0.2F, + 1.4F, + 0.5F, + 180F, + 90F, + 180F); + UIHelper.drawFloatingText( + IOStrRot[2], + accessor.getRenderingPosition(), + 0.2F, + 0.5F, + -0.4F, + 180F, + 90F, + 270F); + UIHelper.drawFloatingText( + IOStrRot[3], + accessor.getRenderingPosition(), + 0.2F, + -0.4F, + 0.5F, + 180F, + 90F, + 0F); + break; + default: + break; + } - if (vOrient == ForgeDirection.WEST) - hOrient += 1; - - if (hOrient == -1) - hOrient = 3; - - String[] IOStr = new String[4]; - 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]; - - for (int i = 0; i < 4 ; i++){ - int j = i + hOrient; - if (j >= 4) j -= 4; - IOStrRot[j] = IOStr[i]; - } - - switch(vOrient){ - case DOWN: - UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 0.2F, 1.4F, 90F, 0F, 0F); // Orient 0 - UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), -0.4F, 0.2F, 0.5F, 90F, 270F, 0F); // Orient 1 - UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.5F, 0.2F, -0.4F, 90F, 180F, 0F); // Orient 2 - UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 1.4F, 0.2F, 0.5F, 90F, 90F, 0F); // Orient 3 - break; - case EAST: - UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.8F, 0.5F, 1.4F, 0F, 90F, 90F); - UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), 0.8F, -0.4F, 0.5F, 0F, 90F, 180F); - UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.8F, 0.5F, -0.4F, 0F, 90F, 270F); - UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 0.8F, 1.4F, 0.5F, 0F, 90F, 0F); - break; - case NORTH: - UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 1.4F, 0.2F, 0F, 180F, 0F); - UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), 1.4F, 0.5F, 0.2F, 0F, 180F, 90F); - UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.5F, -0.4F, 0.2F, 0F, 180F, 180F); - UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), -0.4F, 0.5F, 0.2F, 0F, 180F, 270F); - break; - case SOUTH: - UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 1.4F, 0.8F, 0F, 0F, 0F); - UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), -0.4F, 0.5F, 0.8F, 0F, 0F, 90F); - UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.5F, -0.4F, 0.8F, 0F, 0F, 180F); - UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 1.4F, 0.5F, 0.8F, 0F, 0F, 270F); - break; - case UP: - UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 0.8F, 1.4F, 270F, 180F, 0F); - UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), 1.4F, 0.8F, 0.5F, 270F, 270F, 0F); - UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.5F, 0.8F, -0.4F, 270F, 0F, 0F); - UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), -0.4F, 0.8F, 0.5F, 270F, 90F, 0F); - break; - case WEST: - UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.2F, 0.5F, 1.4F, 180F, 90F, 90F); - UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), 0.2F, 1.4F, 0.5F, 180F, 90F, 180F); - UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.2F, 0.5F, -0.4F, 180F, 90F, 270F); - UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 0.2F, -0.4F, 0.5F, 180F, 90F, 0F); - break; - default: - break; - } - double x = accessor.getRenderingPosition().xCoord; double y = accessor.getRenderingPosition().yCoord; double z = accessor.getRenderingPosition().zCoord; - - switch(vOrient){ - case DOWN: - UIHelper.drawRectangle(x - 0.1, y + 0.1, z, x, y + 0.1, z + 0.35, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 0.65, x, y + 0.1, z + 1.0, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.0, y + 0.1, z, x + 1.1, y + 0.1, z + 0.35, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.0, y + 0.1, z + 0.65, x + 1.1, y + 0.1, z + 1.0, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x - 0.1, y + 0.1, z - 0.1, x + 0.35, y + 0.1, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 0.65, y + 0.1, z - 0.1, x + 1.1, y + 0.1, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 1.0, x + 0.35, y + 0.1, z + 1.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 0.65, y + 0.1, z + 1.0, x + 1.1, y + 0.1, z + 1.1, 255, 255, 255, 150 ); - break; - case EAST: - UIHelper.drawRectangleEW(x + 0.9, y, z - 0.1, x + 0.9, y + 0.35, z, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z - 0.1, x + 0.9, y + 1.0, z, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.9, y, z + 1.0, x + 0.9, y + 0.35, z + 1.1, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z + 1.0, x + 0.9, y + 1.0, z + 1.1, 255, 255, 255, 150 ); + switch (vOrient) { + case DOWN: + UIHelper.drawRectangle(x - 0.1, y + 0.1, z, x, y + 0.1, z + 0.35, 255, 255, 255, 150); + UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 0.65, x, y + 0.1, z + 1.0, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.0, y + 0.1, z, x + 1.1, y + 0.1, z + 0.35, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.0, y + 0.1, z + 0.65, x + 1.1, y + 0.1, z + 1.0, 255, 255, 255, 150); - UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z - 0.1, x + 0.9, y, z + 0.35, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z + 0.65, x + 0.9, y, z + 1.1, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z - 0.1, x + 0.9, y + 1.1, z + 0.35, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z + 0.65, x + 0.9, y + 1.1, z + 1.1, 255, 255, 255, 150 ); - break; - case NORTH: - UIHelper.drawRectangle(x - 0.1, y, z + 0.1, x, y + 0.35, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x - 0.1, y + 0.65, z + 0.1, x, y + 1.0, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.0, y, z + 0.1, x + 1.1, y + 0.35, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.0, y + 0.65, z + 0.1, x + 1.1, y + 1.0, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x - 0.1, y + 0.1, z - 0.1, x + 0.35, y + 0.1, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 0.65, y + 0.1, z - 0.1, x + 1.1, y + 0.1, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 1.0, x + 0.35, y + 0.1, z + 1.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 0.65, y + 0.1, z + 1.0, x + 1.1, y + 0.1, z + 1.1, 255, 255, 255, 150); + break; + case EAST: + UIHelper.drawRectangleEW(x + 0.9, y, z - 0.1, x + 0.9, y + 0.35, z, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z - 0.1, x + 0.9, y + 1.0, z, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.9, y, z + 1.0, x + 0.9, y + 0.35, z + 1.1, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z + 1.0, x + 0.9, y + 1.0, z + 1.1, 255, 255, 255, 150); - UIHelper.drawRectangle(x - 0.1, y - 0.1, z + 0.1, x + 0.35, y, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 0.65, y - 0.1, z + 0.1, x + 1.1, y, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x - 0.1, y + 1.0, z + 0.1, x + 0.35, y + 1.1, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 0.65, y + 1.0, z + 0.1, x + 1.1, y + 1.1, z + 0.1, 255, 255, 255, 150 ); - break; - case SOUTH: - UIHelper.drawRectangle(x, y, z + 0.9, x - 0.1, y + 0.35, z + 0.9, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x, y + 0.65, z + 0.9, x - 0.1, y + 1.0, z + 0.9, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.1, y, z + 0.9, x + 1.0, y + 0.35, z + 0.9, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.1, y + 0.65, z + 0.9, x + 1.0, y + 1.0, z + 0.9, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z - 0.1, x + 0.9, y, z + 0.35, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z + 0.65, x + 0.9, y, z + 1.1, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z - 0.1, x + 0.9, y + 1.1, z + 0.35, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z + 0.65, x + 0.9, y + 1.1, z + 1.1, 255, 255, 255, 150); + break; + case NORTH: + UIHelper.drawRectangle(x - 0.1, y, z + 0.1, x, y + 0.35, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x - 0.1, y + 0.65, z + 0.1, x, y + 1.0, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.0, y, z + 0.1, x + 1.1, y + 0.35, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.0, y + 0.65, z + 0.1, x + 1.1, y + 1.0, z + 0.1, 255, 255, 255, 150); - UIHelper.drawRectangle(x + 0.35, y - 0.1, z + 0.9, x - 0.1, y, z + 0.9, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.10, y - 0.1, z + 0.9, x + 0.65, y, z + 0.9, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 0.35, y + 1.0, z + 0.9, x - 0.1, y + 1.1, z + 0.9, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.1, y + 1.0, z + 0.9, x + 0.65, y + 1.1, z + 0.9, 255, 255, 255, 150 ); - break; - case UP: - UIHelper.drawRectangle(x, y + 0.9, z, x - 0.1, y + 0.9, z + 0.35, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x, y + 0.9, z + 0.65, x - 0.1, y + 0.9, z + 1.0, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.1, y + 0.9, z, x + 1.0, y + 0.9, z + 0.35, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 0.65, x + 1.0, y + 0.9, z + 1.0, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x - 0.1, y - 0.1, z + 0.1, x + 0.35, y, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 0.65, y - 0.1, z + 0.1, x + 1.1, y, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x - 0.1, y + 1.0, z + 0.1, x + 0.35, y + 1.1, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 0.65, y + 1.0, z + 0.1, x + 1.1, y + 1.1, z + 0.1, 255, 255, 255, 150); + break; + case SOUTH: + UIHelper.drawRectangle(x, y, z + 0.9, x - 0.1, y + 0.35, z + 0.9, 255, 255, 255, 150); + UIHelper.drawRectangle(x, y + 0.65, z + 0.9, x - 0.1, y + 1.0, z + 0.9, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.1, y, z + 0.9, x + 1.0, y + 0.35, z + 0.9, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.1, y + 0.65, z + 0.9, x + 1.0, y + 1.0, z + 0.9, 255, 255, 255, 150); - UIHelper.drawRectangle(x + 0.35, y + 0.9, z - 0.1, x - 0.1, y + 0.9, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.1, y + 0.9, z - 0.1, x + 0.65, y + 0.9, z + 0.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x +0.35, y + 0.9, z + 1.0, x - 0.1, y + 0.9, z + 1.1, 255, 255, 255, 150 ); - UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 1.0, x + 0.65, y + 0.9, z + 1.1, 255, 255, 255, 150 ); - - break; - case WEST: - UIHelper.drawRectangleEW(x + 0.1, y+ 0.35, z - 0.1, x + 0.1, y , z, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.1, y + 1.0, z - 0.1, x + 0.1, y + 0.65, z, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.1, y + 0.35, z + 1.0, x + 0.1, y, z + 1.1, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.1, y + 1.0, z + 1.0, x + 0.1, y + 0.65, z + 1.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 0.35, y - 0.1, z + 0.9, x - 0.1, y, z + 0.9, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.10, y - 0.1, z + 0.9, x + 0.65, y, z + 0.9, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 0.35, y + 1.0, z + 0.9, x - 0.1, y + 1.1, z + 0.9, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.1, y + 1.0, z + 0.9, x + 0.65, y + 1.1, z + 0.9, 255, 255, 255, 150); + break; + case UP: + UIHelper.drawRectangle(x, y + 0.9, z, x - 0.1, y + 0.9, z + 0.35, 255, 255, 255, 150); + UIHelper.drawRectangle(x, y + 0.9, z + 0.65, x - 0.1, y + 0.9, z + 1.0, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.1, y + 0.9, z, x + 1.0, y + 0.9, z + 0.35, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 0.65, x + 1.0, y + 0.9, z + 1.0, 255, 255, 255, 150); - UIHelper.drawRectangleEW(x + 0.1, y, z - 0.1, x + 0.1, y - 0.1, z + 0.35, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.1, y, z + 0.65, x + 0.1, y - 0.1, z + 1.1, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z - 0.1, x + 0.1, y + 1.0, z + 0.35, 255, 255, 255, 150 ); - UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z + 0.65, x + 0.1, y + 1.0, z + 1.1, 255, 255, 255, 150 ); - break; - default: - break; - - } - } + UIHelper.drawRectangle(x + 0.35, y + 0.9, z - 0.1, x - 0.1, y + 0.9, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.1, y + 0.9, z - 0.1, x + 0.65, y + 0.9, z + 0.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 0.35, y + 0.9, z + 1.0, x - 0.1, y + 0.9, z + 1.1, 255, 255, 255, 150); + UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 1.0, x + 0.65, y + 0.9, z + 1.1, 255, 255, 255, 150); + + break; + case WEST: + UIHelper.drawRectangleEW(x + 0.1, y + 0.35, z - 0.1, x + 0.1, y, z, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.1, y + 1.0, z - 0.1, x + 0.1, y + 0.65, z, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.1, y + 0.35, z + 1.0, x + 0.1, y, z + 1.1, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.1, y + 1.0, z + 1.0, x + 0.1, y + 0.65, z + 1.1, 255, 255, 255, 150); + + UIHelper.drawRectangleEW(x + 0.1, y, z - 0.1, x + 0.1, y - 0.1, z + 0.35, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.1, y, z + 0.65, x + 0.1, y - 0.1, z + 1.1, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z - 0.1, x + 0.1, y + 1.0, z + 0.35, 255, 255, 255, 150); + UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z + 0.65, x + 0.1, y + 1.0, z + 1.1, 255, 255, 255, 150); + break; + default: + break; + + } + } } diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java index 261f562..52c5de2 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java @@ -1,82 +1,96 @@ package mcp.mobius.waila.addons.projectred; +import static mcp.mobius.waila.api.SpecialChars.*; + 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.*; + +import net.minecraft.item.ItemStack; public class HUDFMPGateLogic implements IWailaFMPProvider { - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaBody(ItemStack itemStack, List 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 getWailaBody(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("pr.showdata")) return currenttip; - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config) { - 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java index 7478702..7b1c85d 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java @@ -1,41 +1,41 @@ package mcp.mobius.waila.addons.projectred; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class ProjectRedModule { - public static void register(){ - try{ - Class ModClass = Class.forName("mrtjp.projectred.ProjectRedIntegration"); - Waila.log.log(Level.INFO, "ProjectRed|Integration mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[ProjectRed] ProjectRed|Integration mod not found."); - return; - } - - ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showio"); - ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showdata"); - - 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); - } - + public static void register() { + try { + Class ModClass = Class.forName("mrtjp.projectred.ProjectRedIntegration"); + Waila.log.log(Level.INFO, "ProjectRed|Integration mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[ProjectRed] ProjectRed|Integration mod not found."); + return; + } + + ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showio"); + ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showdata"); + + 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); + } + } diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java index 6356489..3994ee0 100644 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java @@ -2,7 +2,12 @@ package mcp.mobius.waila.addons.railcraft; import java.util.List; +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; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,75 +15,74 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; -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 HUDHandlerTank implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("railcraft.fluidamount")) return currenttip; - try { - IFluidTank tank = (IFluidTank)RailcraftModule.ITankTile_getTank.invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity())); - if (tank == null) return currenttip; - - FluidStack fluid = tank.getFluid(); + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("railcraft.fluidamount")) return currenttip; + try { + IFluidTank tank = (IFluidTank) RailcraftModule.ITankTile_getTank + .invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity())); + if (tank == null) return currenttip; - String name = currenttip.get(0); - - try{ - name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); - } catch (NullPointerException f){ - name += " " + LangUtil.translateG("hud.msg.empty"); - } - - currenttip.set(0, name); - - } catch (Exception e){ - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - return currenttip; - } + FluidStack fluid = tank.getFluid(); - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("railcraft.fluidamount")) return currenttip; - - try { - IFluidTank tank = (IFluidTank)RailcraftModule.ITankTile_getTank.invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity())); - if (tank == null) return currenttip; - - FluidStack fluid = tank.getFluid(); - if (fluid != null) - currenttip.add(String.format("%d / %d mB", fluid.amount, tank.getInfo().capacity)); - else - currenttip.add(String.format("0 / %d mB", tank.getInfo().capacity)); - - } catch (Exception e){ - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - return currenttip; - } + String name = currenttip.get(0); - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + try { + name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); + } catch (NullPointerException f) { + name += " " + LangUtil.translateG("hud.msg.empty"); + } + + currenttip.set(0, name); + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("railcraft.fluidamount")) return currenttip; + + try { + IFluidTank tank = (IFluidTank) RailcraftModule.ITankTile_getTank + .invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity())); + if (tank == null) return currenttip; + + FluidStack fluid = tank.getFluid(); + if (fluid != null) currenttip.add(String.format("%d / %d mB", fluid.amount, tank.getInfo().capacity)); + else currenttip.add(String.format("0 / %d mB", tank.getInfo().capacity)); + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java index ad4166c..9469be9 100644 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java @@ -2,43 +2,44 @@ package mcp.mobius.waila.addons.railcraft; import java.lang.reflect.Method; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class RailcraftModule { - public static Class TileTankBase = null; - public static Class ITankTile = null; - public static Method ITankTile_getTank = null; - //public static Class StandardTank = null; - - public static void register(){ - try{ - Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft"); - Waila.log.log(Level.INFO, "Railcraft mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found."); - return; - } - - try{ - TileTankBase = Class.forName("mods.railcraft.common.blocks.machine.beta.TileTankBase"); - ITankTile = Class.forName("mods.railcraft.common.blocks.machine.ITankTile"); - ITankTile_getTank = ITankTile.getMethod("getTank"); - //StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank"); - - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[Railcraft] Class not found. " + e); - return; - } catch (NoSuchMethodException e){ - Waila.log.log(Level.WARN, "[Railcraft] Method not found." + e); - return; - } - - ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTankBase); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTankBase); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileTankBase); - } + + public static Class TileTankBase = null; + public static Class ITankTile = null; + public static Method ITankTile_getTank = null; + // public static Class StandardTank = null; + + public static void register() { + try { + Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft"); + Waila.log.log(Level.INFO, "Railcraft mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found."); + return; + } + + try { + TileTankBase = Class.forName("mods.railcraft.common.blocks.machine.beta.TileTankBase"); + ITankTile = Class.forName("mods.railcraft.common.blocks.machine.ITankTile"); + ITankTile_getTank = ITankTile.getMethod("getTank"); + // StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank"); + + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[Railcraft] Class not found. " + e); + return; + } catch (NoSuchMethodException e) { + Waila.log.log(Level.WARN, "[Railcraft] Method not found." + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTankBase); + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTankBase); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTankBase); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java index 5e9bac4..51ec81f 100644 --- a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java @@ -2,99 +2,67 @@ package mcp.mobius.waila.addons.secretrooms; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -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); + @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(Blocks.torch); } + * 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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - else if ( SecretRoomsModule.BlockTorchLever.isInstance(accessor.getBlock()) ){ - return new ItemStack(Blocks.torch); - } - - 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 getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaBody(ItemStack itemStack, List 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); + */ + return null; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + 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; + } - 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); - */ - return null; - } - - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java index 566f07e..6b22bcc 100644 --- a/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java @@ -2,40 +2,27 @@ package mcp.mobius.waila.addons.secretrooms; 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; - } + 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); + */ + } - 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); - */ - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java index d4ea5d9..5ae1a11 100644 --- a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java +++ b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java @@ -1,78 +1,80 @@ package mcp.mobius.waila.addons.statues; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; 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.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 ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - try { - String skinName = (String)StatuesModule.skinName.get(accessor.getTileEntity()); - if (skinName.equals("")){ - TileEntity belowEnt = accessor.getWorld().getTileEntity(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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + try { + String skinName = (String) StatuesModule.skinName.get(accessor.getTileEntity()); + if (skinName.equals("")) { + TileEntity belowEnt = accessor.getWorld().getTileEntity( + accessor.getPosition().blockX, + accessor.getPosition().blockY - 1, + accessor.getPosition().blockZ); + if (StatuesModule.TileEntityStatue.isInstance(belowEnt)) + skinName = (String) StatuesModule.skinName.get(belowEnt); + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (skinName.equals("")) { + currenttip.clear(); + currenttip.add(WHITE + "Statue : Unknown"); + } else { + currenttip.clear(); + currenttip.add(WHITE + "Statue : " + skinName); + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - currenttip.add(BLUE + ITALIC + "Statues" ); - return currenttip; - } + } 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 getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + currenttip.add(BLUE + ITALIC + "Statues"); + return currenttip; + } + + @Override + 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; + } - @Override - 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; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java index ad85ccf..d0728b5 100644 --- a/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java +++ b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java @@ -2,39 +2,39 @@ package mcp.mobius.waila.addons.statues; import java.lang.reflect.Field; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + 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.WARN, "[Statues] Class not found. " + e); - return; - } catch (NoSuchFieldException e){ - Waila.log.log(Level.WARN, "[Statues] Class not found. " + e); - return; - } - - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(), TileEntityStatue); - ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(), TileEntityStatue); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerStatues(), TileEntityStatue); - } - + 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.WARN, "[Statues] Class not found. " + e); + return; + } catch (NoSuchFieldException e) { + Waila.log.log(Level.WARN, "[Statues] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(), TileEntityStatue); + ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(), TileEntityStatue); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerStatues(), TileEntityStatue); + } + } diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java index 09fdda4..0a80659 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java @@ -1,104 +1,114 @@ package mcp.mobius.waila.addons.stevescarts; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.ArrayList; import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; 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.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; - } + private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." }; + private static String sides[] = { "Yellow", "Blue", "Green", "Red" }; - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaBody(ItemStack itemStack, List 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(); + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - 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 itemSelection = (ArrayList) StevesCartsModule.ItemSelections.get(accessor.getTileEntity()); + @Override + public List getWailaBody(ItemStack itemStack, List 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 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; - } + NBTTagCompound tag = accessor.getNBTData(); - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (config.getConfig("stevescarts.colorblind")) { + int side = accessor.getSide().ordinal() - 2; + if (side >= 0) currenttip.add("Looking at side " + WHITE + sides[side]); + } - public int getAmount(int id) - { - switch (id) - { + 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 itemSelection = (ArrayList) 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + public int getAmount(int id) { + switch (id) { case 1: return 1; @@ -134,26 +144,22 @@ public class HUDCargoManager implements IWailaDataProvider { } } - //0 - MAX - //1 - Items - //2 - Stacks - public String getAmountType(int id) - { - if (id <= 6) - { + // 0 - MAX + // 1 - Items + // 2 - Stacks + public String getAmountType(int id) { + if (id <= 6) { return "I"; - } - else - { + } else { return "S"; } - } - - @Override - 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; - } - + } + + @Override + 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; + } + } diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java index 36e003b..42a57f5 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java @@ -2,85 +2,64 @@ package mcp.mobius.waila.addons.stevescarts; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; public class HUDCartAssembler implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("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 : ")); - else - currenttip.add(String.format("Time remaining : ")); - */ - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List 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 : ")); else + * currenttip.add(String.format("Time remaining : ")); + */ + return currenttip; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - 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; - } + @Override + 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; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java index 2352a63..d65b7ab 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java @@ -1,135 +1,143 @@ package mcp.mobius.waila.addons.stevescarts; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -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; - } + private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." }; + private static String sides[] = { "Yellow", "Blue", "Green", "Red" }; - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaBody(ItemStack itemStack, List 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(); + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - 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 = ""; - 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 ? "" : 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 getWailaBody(ItemStack itemStack, List 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; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + NBTTagCompound tag = accessor.getNBTData(); - 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; - } - } - - @Override - 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; - } + 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 = ""; + 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 ? "" : 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 getWailaTail(ItemStack itemStack, List 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; + } + } + + @Override + 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; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java index dfe9124..8afb306 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java @@ -1,93 +1,112 @@ package mcp.mobius.waila.addons.stevescarts; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; +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 net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -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 Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(Entity entity, List 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 getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, + IWailaConfigHandler config) { + if (currenttip.get(0).contains("entity.StevesCarts.Minecart")) { + currenttip.remove(0); + currenttip.add(WHITE + "Modular Minecart"); + } - @Override - public List getWailaBody(Entity entity, List 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; - } + return currenttip; + } - @Override - public List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public List getWailaBody(Entity entity, List 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; + } - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) { - if (te != null) - te.writeToNBT(tag); - return tag; - } + 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 getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) { + if (te != null) te.writeToNBT(tag); + return tag; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java index fbf18fd..4bdf2f0 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java @@ -5,72 +5,50 @@ import java.lang.reflect.Method; 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 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); + */ + } - 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); - */ - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java index b885c83..0741df3 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -1,116 +1,125 @@ package mcp.mobius.waila.addons.thaumcraft; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + 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.world.World; -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 HUDHandlerIAspectContainer implements IWailaDataProvider{ +public class HUDHandlerIAspectContainer implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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; - - NBTTagCompound tag = accessor.getNBTData(); - if (tag.hasKey("Aspects")){ - NBTTagList taglist = tag.getTagList("Aspects", 10); - - List unknownAspects = new ArrayList(); - - for (int i = 0; i < taglist.tagCount(); i++){ - NBTTagCompound subtag = taglist.getCompoundTagAt(i); - - String aspect = Character.toUpperCase(subtag.getString("key").charAt(0)) + subtag.getString("key").substring(1); - String amount = String.valueOf(subtag.getInteger("value")); - - if (!aspect.equals("???")) - currenttip.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount)); - else - unknownAspects.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount)); - } - - currenttip.addAll(unknownAspects); - } - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (!config.getConfig("thaumcraft.aspects")) return currenttip; - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - - try{ - tag.setTag("Aspects", new NBTTagList()); - NBTTagList aspects = tag.getTagList("Aspects", 10); - - ItemStack headSlot = player.inventory.armorInventory[3]; - if (headSlot == null) return tag; - boolean hasReveal = ThaumcraftModule.IGoggles.isInstance(headSlot.getItem()); - if (!hasReveal) return tag; - - HashMap knownAspects = (HashMap) ThaumcraftModule.CommonProxy_getKnownAspects.invoke(ThaumcraftModule.Thaumcraft_proxy.get(null)); - LinkedHashMap playerAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(knownAspects.get(player.getCommandSenderName())); - LinkedHashMap tileAspects = new LinkedHashMap(); - - if (ThaumcraftModule.IAspectContainer.isInstance(te)){ - tileAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(ThaumcraftModule.IAspectContainer_getAspects.invoke(te)); - } else if (ThaumcraftModule.TileAlchemyFurnace.isInstance(te)){ - tileAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(ThaumcraftModule.TileAlchemyFurnace_aspects.get(te)); - } - - for (Object o : tileAspects.keySet()){ - if ((Integer) tileAspects.get(o) > 0){ - if (playerAspects.containsKey(o)){ - NBTTagCompound cmptag = new NBTTagCompound(); - cmptag.setString ("key", (String)ThaumcraftModule.Aspect_tag.get(o)); - cmptag.setInteger("value", (Integer) tileAspects.get(o)); - aspects.appendTag(cmptag); - } else { - NBTTagCompound cmptag = new NBTTagCompound(); - cmptag.setString ("key", "???"); - cmptag.setInteger("value", (Integer) tileAspects.get(o)); - aspects.appendTag(cmptag); - } - } - } - - //for (int i = 0; i < aspects.tagCount(); i++){ - // System.out.printf("%s : %s\n", aspects.getCompoundTagAt(i).getString("key"), aspects.getCompoundTagAt(i).getString("value")); - //} - - - - } catch (Exception e) { - throw new RuntimeException(e); - } - - return tag; - } + NBTTagCompound tag = accessor.getNBTData(); + if (tag.hasKey("Aspects")) { + NBTTagList taglist = tag.getTagList("Aspects", 10); + + List unknownAspects = new ArrayList(); + + for (int i = 0; i < taglist.tagCount(); i++) { + NBTTagCompound subtag = taglist.getCompoundTagAt(i); + + String aspect = Character.toUpperCase(subtag.getString("key").charAt(0)) + + subtag.getString("key").substring(1); + String amount = String.valueOf(subtag.getInteger("value")); + + if (!aspect.equals("???")) + currenttip.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount)); + else unknownAspects.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount)); + } + + currenttip.addAll(unknownAspects); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + + try { + tag.setTag("Aspects", new NBTTagList()); + NBTTagList aspects = tag.getTagList("Aspects", 10); + + ItemStack headSlot = player.inventory.armorInventory[3]; + if (headSlot == null) return tag; + boolean hasReveal = ThaumcraftModule.IGoggles.isInstance(headSlot.getItem()); + if (!hasReveal) return tag; + + HashMap knownAspects = (HashMap) ThaumcraftModule.CommonProxy_getKnownAspects + .invoke(ThaumcraftModule.Thaumcraft_proxy.get(null)); + LinkedHashMap playerAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects + .get(knownAspects.get(player.getCommandSenderName())); + LinkedHashMap tileAspects = new LinkedHashMap(); + + if (ThaumcraftModule.IAspectContainer.isInstance(te)) { + tileAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects + .get(ThaumcraftModule.IAspectContainer_getAspects.invoke(te)); + } else if (ThaumcraftModule.TileAlchemyFurnace.isInstance(te)) { + tileAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects + .get(ThaumcraftModule.TileAlchemyFurnace_aspects.get(te)); + } + + for (Object o : tileAspects.keySet()) { + if ((Integer) tileAspects.get(o) > 0) { + if (playerAspects.containsKey(o)) { + NBTTagCompound cmptag = new NBTTagCompound(); + cmptag.setString("key", (String) ThaumcraftModule.Aspect_tag.get(o)); + cmptag.setInteger("value", (Integer) tileAspects.get(o)); + aspects.appendTag(cmptag); + } else { + NBTTagCompound cmptag = new NBTTagCompound(); + cmptag.setString("key", "???"); + cmptag.setInteger("value", (Integer) tileAspects.get(o)); + aspects.appendTag(cmptag); + } + } + } + + // for (int i = 0; i < aspects.tagCount(); i++){ + // System.out.printf("%s : %s\n", aspects.getCompoundTagAt(i).getString("key"), + // aspects.getCompoundTagAt(i).getString("value")); + // } + + } catch (Exception e) { + throw new RuntimeException(e); + } + + return tag; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java index f6bc4e3..487dcd3 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java @@ -3,79 +3,76 @@ package mcp.mobius.waila.addons.thaumcraft; import java.lang.reflect.Field; import java.lang.reflect.Method; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + 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 Thaumcraft = null; - public static Field Thaumcraft_proxy = null; - - public static Class IAspectContainer = null; - public static Method IAspectContainer_getAspects = null; - - public static Class AspectList = null; - public static Method AspectList_writeToNBT = null; - public static Field AspectList_aspects = null; - public static Class TileAlchemyFurnace = null; - public static Field TileAlchemyFurnace_aspects = null; - - public static Class Aspect = null; - public static Field Aspect_tag = null; - - public static Class CommonProxy = null; - public static Method CommonProxy_getKnownAspects = null; + public static Class Thaumcraft = null; + public static Field Thaumcraft_proxy = null; - public static Class IGoggles = null; + public static Class IAspectContainer = null; + public static Method IAspectContainer_getAspects = null; - //public static Class TileAlchemyFurnace = null; - - - public static void register(){ - try{ - 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); - AspectList_aspects = AspectList.getDeclaredField("aspects"); + public static Class AspectList = null; + public static Method AspectList_writeToNBT = null; + public static Field AspectList_aspects = null; - TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace"); - TileAlchemyFurnace_aspects = TileAlchemyFurnace.getDeclaredField("aspects"); - - Aspect = Class.forName("thaumcraft.api.aspects.Aspect"); - Aspect_tag = Aspect.getDeclaredField("tag"); - Aspect_tag.setAccessible(true); - - CommonProxy = Class.forName("thaumcraft.common.CommonProxy"); - CommonProxy_getKnownAspects = CommonProxy.getDeclaredMethod("getKnownAspects"); + public static Class TileAlchemyFurnace = null; + public static Field TileAlchemyFurnace_aspects = null; - IGoggles = Class.forName("thaumcraft.api.IGoggles"); + public static Class Aspect = null; + public static Field Aspect_tag = null; - 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); - return; - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e); - return; - } - - - - } + public static Class CommonProxy = null; + public static Method CommonProxy_getKnownAspects = null; + + public static Class IGoggles = null; + + // public static Class TileAlchemyFurnace = null; + + public static void register() { + try { + 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); + AspectList_aspects = AspectList.getDeclaredField("aspects"); + + TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace"); + TileAlchemyFurnace_aspects = TileAlchemyFurnace.getDeclaredField("aspects"); + + Aspect = Class.forName("thaumcraft.api.aspects.Aspect"); + Aspect_tag = Aspect.getDeclaredField("tag"); + Aspect_tag.setAccessible(true); + + CommonProxy = Class.forName("thaumcraft.common.CommonProxy"); + CommonProxy_getKnownAspects = CommonProxy.getDeclaredMethod("getKnownAspects"); + + IGoggles = Class.forName("thaumcraft.api.IGoggles"); + + 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); + return; + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e); + return; + } + + } } diff --git a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java index 9e69e38..3066943 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java +++ b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java @@ -1,9 +1,12 @@ package mcp.mobius.waila.addons.thermaldynamics; +import java.util.List; + 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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,29 +14,28 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import java.util.List; - /** * Created by Lordmau5 on 28.02.2015. */ public class HUDHandlerDuct implements IWailaDataProvider { @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return null; } @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { if (!config.getConfig("thermaldynamics.fluiductsFluid")) return currenttip; FluidStack fluid = FluidStack.loadFluidStackFromNBT(accessor.getNBTData()); String name = ""; - try{ + try { name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); - } catch (NullPointerException f){ + } catch (NullPointerException f) { name += " " + LangUtil.translateG("hud.msg.empty"); } @@ -42,14 +44,14 @@ public class HUDHandlerDuct implements IWailaDataProvider { } @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { if (!config.getConfig("thermaldynamics.fluiductsAmount")) return currenttip; int amount = 0; NBTTagCompound tag = accessor.getNBTData(); - if (tag.hasKey("Amount")) - amount = accessor.getNBTInteger(tag, "Amount"); + if (tag.hasKey("Amount")) amount = accessor.getNBTInteger(tag, "Amount"); currenttip.add(String.format(" %d / 1000 mB", amount)); @@ -57,14 +59,15 @@ public class HUDHandlerDuct implements IWailaDataProvider { } @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - if (te != null) - te.writeToNBT(tag); + 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; } diff --git a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java index c0cb863..1e23e10 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java @@ -2,43 +2,38 @@ package mcp.mobius.waila.addons.thermaldynamics; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; + import org.apache.logging.log4j.Level; public class ThermalDynamicsModule { public static Class TileFluidDuct = null; - public static void register(){ + public static void register() { // XXX : We register the Fluiduct - try{ - TileFluidDuct = Class.forName("cofh.thermaldynamics.ducts.fluid.TileFluidDuct"); + try { + TileFluidDuct = Class.forName("cofh.thermaldynamics.ducts.fluid.TileFluidDuct"); ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsFluid"); ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsAmount"); ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerDuct(), TileFluidDuct); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDuct(), TileFluidDuct); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerDuct(), TileFluidDuct); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDuct(), TileFluidDuct); - } catch (Exception e){ + } catch (Exception e) { Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks." + e); } // XXX : We register the IBlockInfo interface - /* - try{ - IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); - IBlockInfo_getBlockInfo = IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, ForgeDirection.class, EntityPlayer.class, List.class, boolean.class); - - - //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); - - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); - } - */ + /* + * try{ IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); IBlockInfo_getBlockInfo = + * IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, + * ForgeDirection.class, EntityPlayer.class, List.class, boolean.class); + * //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); + * ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo); + * ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); } catch (Exception + * e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); } + */ } - } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java index 59c39e9..e594855 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java @@ -1,11 +1,14 @@ package mcp.mobius.waila.addons.thermalexpansion; -import cpw.mods.fml.common.registry.GameData; +import java.lang.reflect.InvocationTargetException; +import java.util.List; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.SpecialChars; import mcp.mobius.waila.cbcore.LangUtil; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -13,34 +16,39 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import java.lang.reflect.InvocationTargetException; -import java.util.List; +import cpw.mods.fml.common.registry.GameData; public class HUDHandlerCache implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return null; } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if(!config.getConfig("thermalexpansion.cache")) - return currenttip; + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("thermalexpansion.cache")) return currenttip; try { ItemStack storedItem = null; - if(accessor.getNBTData().hasKey("Item")) + if (accessor.getNBTData().hasKey("Item")) storedItem = readItemStack(accessor.getNBTData().getCompoundTag("Item")); String name = currenttip.get(0); String color = ""; - if(name.startsWith("\u00a7")) - color = name.substring(0, 2); + if (name.startsWith("\u00a7")) color = name.substring(0, 2); - if(storedItem != null) { + if (storedItem != null) { String namex = GameData.getItemRegistry().getNameForObject(storedItem.getItem()); - name += String.format(" < " + SpecialChars.getRenderString("waila.stack", "1", namex, "0", String.valueOf(storedItem.getItemDamage())) + color + " %s >", storedItem.getDisplayName()); - } - else - name += " " + LangUtil.translateG("hud.msg.empty"); + name += String.format( + " < " + SpecialChars.getRenderString( + "waila.stack", + "1", + namex, + "0", + String.valueOf(storedItem.getItemDamage())) + color + " %s >", + storedItem.getDisplayName()); + } else name += " " + LangUtil.translateG("hud.msg.empty"); currenttip.set(0, name); } catch (Exception e) { @@ -48,44 +56,39 @@ public class HUDHandlerCache implements IWailaDataProvider { } return currenttip; - } + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("thermalexpansion.cache")) - return currenttip; + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("thermalexpansion.cache")) return currenttip; NBTTagCompound tag = accessor.getNBTData(); ItemStack storedItem = null; - if(tag.hasKey("Item")) - storedItem = readItemStack(tag.getCompoundTag("Item")); + if (tag.hasKey("Item")) storedItem = readItemStack(tag.getCompoundTag("Item")); int stored = 0; int maxStored = 0; - if(tag.hasKey("Stored")) - stored = tag.getInteger("Stored"); - if(tag.hasKey("MaxStored")) - maxStored = tag.getInteger("MaxStored"); + if (tag.hasKey("Stored")) stored = tag.getInteger("Stored"); + if (tag.hasKey("MaxStored")) maxStored = tag.getInteger("MaxStored"); - if(storedItem != null) { + if (storedItem != null) { currenttip.add("Stored: " + stored + "/" + maxStored); - } - else - currenttip.add("Capacity: " + maxStored); + } else currenttip.add("Capacity: " + maxStored); + return currenttip; + } - return currenttip; - } + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - if(te != null) - te.writeToNBT(tag); + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + if (te != null) te.writeToNBT(tag); try { tag.setInteger("MaxStored", (Integer) ThermalExpansionModule.TileCache_getMaxStored.invoke(te)); tag.setInteger("Stored", (Integer) ThermalExpansionModule.TileCache_getStored.invoke(te)); @@ -95,7 +98,7 @@ public class HUDHandlerCache implements IWailaDataProvider { e.printStackTrace(); } return tag; - } + } public ItemStack readItemStack(NBTTagCompound tag) { ItemStack is = new ItemStack(Item.getItemById(tag.getShort("id"))); @@ -107,5 +110,5 @@ public class HUDHandlerCache implements IWailaDataProvider { return is; } - + } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java index 6f34338..27ba42e 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java @@ -2,56 +2,67 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; public class HUDHandlerEnergyCell implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("thermalexpansion.energycell")) return currenttip; - - int energyReceive = accessor.getNBTInteger(accessor.getNBTData(), "Recv"); - int energySend = accessor.getNBTInteger(accessor.getNBTData(), "Send"); - - currenttip.add(String.format("%s/%s : %d / %d RF/t", LangUtil.translateG("hud.msg.in"), LangUtil.translateG("hud.msg.out"), energyReceive, energySend)); - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("thermalexpansion.energycell")) return currenttip; - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + int energyReceive = accessor.getNBTInteger(accessor.getNBTData(), "Recv"); + int energySend = accessor.getNBTInteger(accessor.getNBTData(), "Send"); + + currenttip.add( + String.format( + "%s/%s : %d / %d RF/t", + LangUtil.translateG("hud.msg.in"), + LangUtil.translateG("hud.msg.out"), + energyReceive, + energySend)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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); + tag.setInteger("Recv", recv); + tag.setInteger("Send", send); + } catch (Exception e) { + throw new RuntimeException(e); + } + return tag; + } - @Override - 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); - tag.setInteger("Recv", recv); - tag.setInteger("Send", send); - } catch (Exception e) { - throw new RuntimeException(e); - } - return tag; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java index 21f6263..e42b020 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java @@ -3,56 +3,61 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.ArrayList; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IChatComponent; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; public class HUDHandlerIBlockInfo implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - try{ - List info = new ArrayList(); - Block block = world.getBlock(x, y, z); - ThermalExpansionModule.IBlockInfo_getBlockInfo.invoke(block, world, x, y, z, ForgeDirection.UNKNOWN, player, info, false); - - for (Object i : info){ - System.out.printf("%s\n", i); - } - - } catch (Exception e){ - throw new RuntimeException(e); - } - - return tag; - } + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + try { + List info = new ArrayList(); + Block block = world.getBlock(x, y, z); + ThermalExpansionModule.IBlockInfo_getBlockInfo + .invoke(block, world, x, y, z, ForgeDirection.UNKNOWN, player, info, false); + + for (Object i : info) { + System.out.printf("%s\n", i); + } + + } catch (Exception e) { + throw new RuntimeException(e); + } + + return tag; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java index 5e636e9..e077a5e 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java @@ -2,78 +2,87 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; +import mcp.mobius.waila.api.ITaggedList; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.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 mcp.mobius.waila.api.ITaggedList; public class HUDHandlerIEnergyHandler implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("thermalexpansion.energyhandler")) return currenttip; - if (!accessor.getNBTData().hasKey("Energy")) return currenttip; - - int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy"); - int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage"); - try { - if ((maxEnergy != 0) && (((ITaggedList)currenttip).getEntries("RFEnergyStorage").size() == 0)){ - ((ITaggedList)currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage"); - } - } catch (Exception e){ - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (!config.getConfig("thermalexpansion.energyhandler")) return currenttip; + if (!accessor.getNBTData().hasKey("Energy")) return currenttip; - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - try{ - Integer energy = -1; - Integer maxsto = -1; - if (ThermalExpansionModule.IEnergyInfo.isInstance(te)){ - energy = (Integer) ThermalExpansionModule.IEnergyInfo_getCurStorage.invoke(te); - maxsto = (Integer) ThermalExpansionModule.IEnergyInfo_getMaxStorage.invoke(te); - } else if (ThermalExpansionModule.IEnergyProvider.isInstance(te)){ - energy = (Integer) ThermalExpansionModule.IEnergyProvider_getCurStorage.invoke(te, ForgeDirection.UNKNOWN); - maxsto = (Integer) ThermalExpansionModule.IEnergyProvider_getMaxStorage.invoke(te, ForgeDirection.UNKNOWN); - } else if (ThermalExpansionModule.IEnergyReceiver.isInstance(te)){ - energy = (Integer) ThermalExpansionModule.IEnergyReceiver_getCurStorage.invoke(te, ForgeDirection.UNKNOWN); - maxsto = (Integer) ThermalExpansionModule.IEnergyReceiver_getMaxStorage.invoke(te, ForgeDirection.UNKNOWN); - } + int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy"); + int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage"); + try { + if ((maxEnergy != 0) && (((ITaggedList) currenttip).getEntries("RFEnergyStorage").size() == 0)) { + ((ITaggedList) currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage"); + } + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + try { + Integer energy = -1; + Integer maxsto = -1; + if (ThermalExpansionModule.IEnergyInfo.isInstance(te)) { + energy = (Integer) ThermalExpansionModule.IEnergyInfo_getCurStorage.invoke(te); + maxsto = (Integer) ThermalExpansionModule.IEnergyInfo_getMaxStorage.invoke(te); + } else if (ThermalExpansionModule.IEnergyProvider.isInstance(te)) { + energy = (Integer) ThermalExpansionModule.IEnergyProvider_getCurStorage + .invoke(te, ForgeDirection.UNKNOWN); + maxsto = (Integer) ThermalExpansionModule.IEnergyProvider_getMaxStorage + .invoke(te, ForgeDirection.UNKNOWN); + } else if (ThermalExpansionModule.IEnergyReceiver.isInstance(te)) { + energy = (Integer) ThermalExpansionModule.IEnergyReceiver_getCurStorage + .invoke(te, ForgeDirection.UNKNOWN); + maxsto = (Integer) ThermalExpansionModule.IEnergyReceiver_getMaxStorage + .invoke(te, ForgeDirection.UNKNOWN); + } + + tag.setInteger("Energy", energy); + tag.setInteger("MaxStorage", maxsto); + + } catch (Exception e) { + throw new RuntimeException(e); + } + + return tag; + } - tag.setInteger("Energy", energy); - tag.setInteger("MaxStorage", maxsto); - - } catch (Exception e){ - throw new RuntimeException(e); - } - - return tag; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java index a3d2540..4970505 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java @@ -2,78 +2,82 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; - public class HUDHandlerISecureTile implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("thermalexpansion.owner")){ - - String owner = accessor.getNBTData().getString("Owner"); - int iaccess = accessor.getNBTInteger(accessor.getNBTData(), "Access"); - - if (owner.equals("[None]")) - return currenttip; - - String access = "INVALID"; - switch(iaccess){ - case 0: - access = LangUtil.translateG("hud.msg.public"); - break; - case 1: - access = LangUtil.translateG("hud.msg.restricted"); - break; - case 2: - access = LangUtil.translateG("hud.msg.private"); - break; - } - - currenttip.add(String.format("%s : \u00a7f%s\u00a7r [ %s ]", LangUtil.translateG("hud.msg.owner"), owner, access)); - - } - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (config.getConfig("thermalexpansion.owner")) { - @Override - 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(); - - tag.setString("Owner", owner); - tag.setInteger("Access", access); - - } catch (Exception e) { - throw new RuntimeException(e); - } - return tag; - } + String owner = accessor.getNBTData().getString("Owner"); + int iaccess = accessor.getNBTInteger(accessor.getNBTData(), "Access"); + + if (owner.equals("[None]")) return currenttip; + + String access = "INVALID"; + switch (iaccess) { + case 0: + access = LangUtil.translateG("hud.msg.public"); + break; + case 1: + access = LangUtil.translateG("hud.msg.restricted"); + break; + case 2: + access = LangUtil.translateG("hud.msg.private"); + break; + } + + currenttip.add( + String.format("%s : \u00a7f%s\u00a7r [ %s ]", LangUtil.translateG("hud.msg.owner"), owner, access)); + + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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(); + + tag.setString("Owner", owner); + tag.setInteger("Access", access); + + } catch (Exception e) { + throw new RuntimeException(e); + } + return tag; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java index dd2944a..57d2925 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java @@ -2,95 +2,103 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; +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; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -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 HUDHandlerTank implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip; - - try { - FluidStack fluid = (FluidStack)ThermalExpansionModule.TileTank_getTankFluid.invoke(accessor.getTileEntity()); - String name = currenttip.get(0); - - try{ - name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); - } catch (NullPointerException f){ - name += " " + LangUtil.translateG("hud.msg.empty"); - } - - currenttip.set(0, name); - - } catch (Exception e){ - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - return currenttip; - } + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip; - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - try { - if (config.getConfig("thermalexpansion.fluidamount")){ - int amount = 0; - if (accessor.getNBTData().hasKey("Amount")) - amount = accessor.getNBTInteger(accessor.getNBTData(), "Amount"); - - Integer capacity = (Integer)ThermalExpansionModule.TileTank_getTankCapacity.invoke(accessor.getTileEntity()); - - currenttip.add(String.format("%d / %d mB", amount, capacity)); - } - - if (config.getConfig("thermalexpansion.tankmode")){ - Byte mode = (Byte)ThermalExpansionModule.TileTank_mode.get(accessor.getTileEntity()); - if (mode == 0) - currenttip.add(String.format("%s : \u00a7a%s", LangUtil.translateG("hud.msg.mode"), LangUtil.translateG("hud.msg.input"))); - else if (mode == 1) - currenttip.add(String.format("%s : \u00a7c%s", LangUtil.translateG("hud.msg.mode"), LangUtil.translateG("hud.msg.output"))); - else - currenttip.add(String.format("Mode : Unknown (%d)", mode)); - } - - - - } catch (Exception e){ - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - - - return currenttip; - } + try { + FluidStack fluid = (FluidStack) ThermalExpansionModule.TileTank_getTankFluid + .invoke(accessor.getTileEntity()); + String name = currenttip.get(0); - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + try { + name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); + } catch (NullPointerException f) { + name += " " + LangUtil.translateG("hud.msg.empty"); + } + + currenttip.set(0, name); + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + try { + if (config.getConfig("thermalexpansion.fluidamount")) { + int amount = 0; + if (accessor.getNBTData().hasKey("Amount")) + amount = accessor.getNBTInteger(accessor.getNBTData(), "Amount"); + + Integer capacity = (Integer) ThermalExpansionModule.TileTank_getTankCapacity + .invoke(accessor.getTileEntity()); + + currenttip.add(String.format("%d / %d mB", amount, capacity)); + } + + if (config.getConfig("thermalexpansion.tankmode")) { + Byte mode = (Byte) ThermalExpansionModule.TileTank_mode.get(accessor.getTileEntity()); + if (mode == 0) currenttip.add( + String.format( + "%s : \u00a7a%s", + LangUtil.translateG("hud.msg.mode"), + LangUtil.translateG("hud.msg.input"))); + else if (mode == 1) currenttip.add( + String.format( + "%s : \u00a7c%s", + LangUtil.translateG("hud.msg.mode"), + LangUtil.translateG("hud.msg.output"))); + else currenttip.add(String.format("Mode : Unknown (%d)", mode)); + } + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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); + } catch (Exception e) { + throw new RuntimeException(e); + } + return tag; + } - @Override - 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); - } catch (Exception e) { - throw new RuntimeException(e); - } - return tag; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java index 187bfd6..9efead2 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java @@ -2,109 +2,114 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; +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 net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; public class HUDHandlerTesseract implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 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("thermalexpansion.tesssendrecv")){ - String send = String.format("%s : ", LangUtil.translateG("hud.msg.send")); - String recv = String.format("%s : ", LangUtil.translateG("hud.msg.recv")); - String item = String.format("\u00a7a%s ", LangUtil.translateG("hud.msg.item")); - String fluid= String.format("\u00a79%s ", LangUtil.translateG("hud.msg.fluid")); - String energ= String.format("\u00a7c%s ", LangUtil.translateG("hud.msg.energ")); - - - switch (accessor.getNBTInteger(accessor.getNBTData(), "Item.Mode")){ - case 0: - send += item; - break; - case 1: - recv += item; - break; - case 2: - send += item; - recv += item; - break; - } - - switch (accessor.getNBTInteger(accessor.getNBTData(), "Fluid.Mode")){ - case 0: - send += fluid; - break; - case 1: - recv += fluid; - break; - case 2: - send += fluid; - recv += fluid; - break; - } - - switch (accessor.getNBTInteger(accessor.getNBTData(), "Energy.Mode")){ - case 0: - send += energ; - break; - case 1: - recv += energ; - break; - case 2: - send += energ; - recv += energ; - break; - } - - if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.send")))) - currenttip.add(send); - - if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.recv")))) - currenttip.add(recv); - } - - if (config.getConfig("thermalexpansion.tessfreq")) - currenttip.add(String.format("%s : %d",LangUtil.translateG("hud.msg.frequency"), accessor.getNBTInteger(accessor.getNBTData(), "Frequency"))); - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + if (config.getConfig("thermalexpansion.tesssendrecv")) { + String send = String.format("%s : ", LangUtil.translateG("hud.msg.send")); + String recv = String.format("%s : ", LangUtil.translateG("hud.msg.recv")); + String item = String.format("\u00a7a%s ", LangUtil.translateG("hud.msg.item")); + String fluid = String.format("\u00a79%s ", LangUtil.translateG("hud.msg.fluid")); + String energ = String.format("\u00a7c%s ", LangUtil.translateG("hud.msg.energ")); + + switch (accessor.getNBTInteger(accessor.getNBTData(), "Item.Mode")) { + case 0: + send += item; + break; + case 1: + recv += item; + break; + case 2: + send += item; + recv += item; + break; + } + + switch (accessor.getNBTInteger(accessor.getNBTData(), "Fluid.Mode")) { + case 0: + send += fluid; + break; + case 1: + recv += fluid; + break; + case 2: + send += fluid; + recv += fluid; + break; + } + + switch (accessor.getNBTInteger(accessor.getNBTData(), "Energy.Mode")) { + case 0: + send += energ; + break; + case 1: + recv += energ; + break; + case 2: + send += energ; + recv += energ; + break; + } + + if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.send")))) currenttip.add(send); + + if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.recv")))) currenttip.add(recv); + } + + if (config.getConfig("thermalexpansion.tessfreq")) currenttip.add( + String.format( + "%s : %d", + LangUtil.translateG("hud.msg.frequency"), + accessor.getNBTInteger(accessor.getNBTData(), "Frequency"))); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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); + byte modeEnergy = ThermalExpansionModule.TileTesseract_Energy.getByte(te); + tag.setByte("Item.Mode", modeItem); + tag.setByte("Fluid.Mode", modeFluid); + tag.setByte("Energy.Mode", modeEnergy); + } catch (Exception e) { + throw new RuntimeException(e); + } + return tag; + } - @Override - 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); - byte modeEnergy = ThermalExpansionModule.TileTesseract_Energy.getByte(te); - tag.setByte("Item.Mode", modeItem); - tag.setByte("Fluid.Mode", modeFluid); - tag.setByte("Energy.Mode", modeEnergy); - } catch (Exception e) { - throw new RuntimeException(e); - } - return tag; - } - } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java index 218bbce..85f598b 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java @@ -1,181 +1,176 @@ package mcp.mobius.waila.addons.thermalexpansion; -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import net.minecraftforge.common.util.ForgeDirection; -import org.apache.logging.log4j.Level; - import java.lang.reflect.Field; import java.lang.reflect.Method; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +import net.minecraftforge.common.util.ForgeDirection; + +import org.apache.logging.log4j.Level; + public class ThermalExpansionModule { - public static Class IEnergyProvider = null; - public static Method IEnergyProvider_getMaxStorage = null; - public static Method IEnergyProvider_getCurStorage = null; + public static Class IEnergyProvider = null; + public static Method IEnergyProvider_getMaxStorage = null; + public static Method IEnergyProvider_getCurStorage = null; - public static Class IEnergyReceiver = null; - public static Method IEnergyReceiver_getMaxStorage = null; - public static Method IEnergyReceiver_getCurStorage = null; + public static Class IEnergyReceiver = null; + public static Method IEnergyReceiver_getMaxStorage = null; + public static Method IEnergyReceiver_getCurStorage = null; - public static Class IEnergyInfo = null; - public static Method IEnergyInfo_getMaxStorage = null; - public static Method IEnergyInfo_getCurStorage = null; - - public static Class TileEnergyCell = null; - public static Field TileEnergyCell_Recv = null; - public static Field TileEnergyCell_Send = null; - - public static Class TileTank = null; - public static Method TileTank_getTankFluid = null; - public static Method TileTank_getTankCapacity = null; - public static Method TileTank_getTankAmount = null; - public static Field TileTank_mode = null; - - public static Class TileTesseract = null; - public static Field TileTesseract_Item = null; - public static Field TileTesseract_Fluid = null; - public static Field TileTesseract_Energy = null; - - public static Class ISecureTile = null; - public static Method ISecureTile_getAccess = null; - public static Method ISecureTile_getOwnerName = null; + public static Class IEnergyInfo = null; + public static Method IEnergyInfo_getMaxStorage = null; + public static Method IEnergyInfo_getCurStorage = null; - public static Class TileCache = null; + public static Class TileEnergyCell = null; + public static Field TileEnergyCell_Recv = null; + public static Field TileEnergyCell_Send = null; + + public static Class TileTank = null; + public static Method TileTank_getTankFluid = null; + public static Method TileTank_getTankCapacity = null; + public static Method TileTank_getTankAmount = null; + public static Field TileTank_mode = null; + + public static Class TileTesseract = null; + public static Field TileTesseract_Item = null; + public static Field TileTesseract_Fluid = null; + public static Field TileTesseract_Energy = null; + + public static Class ISecureTile = null; + public static Method ISecureTile_getAccess = null; + public static Method ISecureTile_getOwnerName = null; + + public static Class TileCache = null; public static Method TileCache_getItemStack = null; public static Method TileCache_getMaxStored = null; public static Method TileCache_getStored = null; - - public static Class BlockMultipart = null; - - public static Class IBlockInfo = null; - public static Method IBlockInfo_getBlockInfo = null; - - public static void register(){ - // XXX : We register the Energy interface first - try{ - IEnergyProvider = Class.forName("cofh.api.energy.IEnergyProvider"); - IEnergyProvider_getMaxStorage = IEnergyProvider.getMethod("getMaxEnergyStored", ForgeDirection.class); - IEnergyProvider_getCurStorage = IEnergyProvider.getMethod("getEnergyStored", ForgeDirection.class); - - IEnergyReceiver = Class.forName("cofh.api.energy.IEnergyReceiver"); - IEnergyReceiver_getMaxStorage = IEnergyReceiver.getMethod("getMaxEnergyStored", ForgeDirection.class); - IEnergyReceiver_getCurStorage = IEnergyReceiver.getMethod("getEnergyStored", ForgeDirection.class); - - IEnergyInfo = Class.forName("cofh.api.tileentity.IEnergyInfo"); - IEnergyInfo_getMaxStorage = IEnergyInfo.getMethod("getInfoMaxEnergyStored"); - IEnergyInfo_getCurStorage = IEnergyInfo.getMethod("getInfoEnergyStored"); - - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyProvider); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyReceiver); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyInfo); - - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e); - } + public static Class BlockMultipart = null; - // XXX : We register the energy cell - try{ - TileEnergyCell = Class.forName("cofh.thermalexpansion.block.cell.TileCell"); - TileEnergyCell_Recv = TileEnergyCell.getDeclaredField("energyReceive"); - TileEnergyCell_Send = TileEnergyCell.getDeclaredField("energySend"); - - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerEnergyCell(), TileEnergyCell); - - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks." + e); - } - - // XXX : We register the Tank interface - try{ - TileTank = Class.forName("cofh.thermalexpansion.block.tank.TileTank"); - TileTank_getTankFluid = TileTank.getMethod("getTankFluid"); - TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity"); - TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount"); - TileTank_mode = TileTank.getField("mode"); - - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype"); - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount"); - ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode"); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileTank); - - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks." + e); - } - - // XXX : We register the Tesseract interface - try{ - TileTesseract = Class.forName("cofh.thermalexpansion.block.ender.TileTesseract"); - TileTesseract_Item = TileTesseract.getDeclaredField("modeItem"); - TileTesseract_Fluid = TileTesseract.getDeclaredField("modeFluid"); - TileTesseract_Energy = TileTesseract.getDeclaredField("modeEnergy"); - - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tesssendrecv"); - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tessfreq"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTesseract(), TileTesseract); - - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e); - } + public static Class IBlockInfo = null; + public static Method IBlockInfo_getBlockInfo = null; - // XXX : We register the ISecureTile interface - try{ - ISecureTile = Class.forName("cofh.api.tileentity.ISecurable"); - ISecureTile_getAccess = ISecureTile.getDeclaredMethod("getAccess"); - ISecureTile_getOwnerName = ISecureTile.getDeclaredMethod("getOwnerName"); - - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerISecureTile(), ISecureTile); - //ModuleRegistrar.instance().registerSyncedNBTKey("Owner", ISecureTile); - //ModuleRegistrar.instance().registerSyncedNBTKey("Access", ISecureTile); - - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e); - } + public static void register() { + // XXX : We register the Energy interface first + try { + IEnergyProvider = Class.forName("cofh.api.energy.IEnergyProvider"); + IEnergyProvider_getMaxStorage = IEnergyProvider.getMethod("getMaxEnergyStored", ForgeDirection.class); + IEnergyProvider_getCurStorage = IEnergyProvider.getMethod("getEnergyStored", ForgeDirection.class); + + IEnergyReceiver = Class.forName("cofh.api.energy.IEnergyReceiver"); + IEnergyReceiver_getMaxStorage = IEnergyReceiver.getMethod("getMaxEnergyStored", ForgeDirection.class); + IEnergyReceiver_getCurStorage = IEnergyReceiver.getMethod("getEnergyStored", ForgeDirection.class); + + IEnergyInfo = Class.forName("cofh.api.tileentity.IEnergyInfo"); + IEnergyInfo_getMaxStorage = IEnergyInfo.getMethod("getInfoMaxEnergyStored"); + IEnergyInfo_getCurStorage = IEnergyInfo.getMethod("getInfoEnergyStored"); + + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo); + + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e); + } + + // XXX : We register the energy cell + try { + TileEnergyCell = Class.forName("cofh.thermalexpansion.block.cell.TileCell"); + TileEnergyCell_Recv = TileEnergyCell.getDeclaredField("energyReceive"); + TileEnergyCell_Send = TileEnergyCell.getDeclaredField("energySend"); + + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerEnergyCell(), TileEnergyCell); + + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks." + e); + } + + // XXX : We register the Tank interface + try { + TileTank = Class.forName("cofh.thermalexpansion.block.tank.TileTank"); + TileTank_getTankFluid = TileTank.getMethod("getTankFluid"); + TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity"); + TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount"); + TileTank_mode = TileTank.getField("mode"); + + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype"); + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount"); + ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode"); + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTank); + + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks." + e); + } + + // XXX : We register the Tesseract interface + try { + TileTesseract = Class.forName("cofh.thermalexpansion.block.ender.TileTesseract"); + TileTesseract_Item = TileTesseract.getDeclaredField("modeItem"); + TileTesseract_Fluid = TileTesseract.getDeclaredField("modeFluid"); + TileTesseract_Energy = TileTesseract.getDeclaredField("modeEnergy"); + + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tesssendrecv"); + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tessfreq"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTesseract(), TileTesseract); + + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e); + } + + // XXX : We register the ISecureTile interface + try { + ISecureTile = Class.forName("cofh.api.tileentity.ISecurable"); + ISecureTile_getAccess = ISecureTile.getDeclaredMethod("getAccess"); + ISecureTile_getOwnerName = ISecureTile.getDeclaredMethod("getOwnerName"); + + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerISecureTile(), ISecureTile); + // ModuleRegistrar.instance().registerSyncedNBTKey("Owner", ISecureTile); + // ModuleRegistrar.instance().registerSyncedNBTKey("Access", ISecureTile); + + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e); + } // XXX : We register the Cache interface - try{ + try { TileCache = Class.forName("cofh.thermalexpansion.block.cache.TileCache"); - TileCache_getItemStack = TileCache.getDeclaredMethod("getStoredItemType"); - TileCache_getMaxStored = TileCache.getDeclaredMethod("getMaxStoredCount"); - TileCache_getStored = TileCache.getDeclaredMethod("getStoredCount"); + TileCache_getItemStack = TileCache.getDeclaredMethod("getStoredItemType"); + TileCache_getMaxStored = TileCache.getDeclaredMethod("getMaxStoredCount"); + TileCache_getStored = TileCache.getDeclaredMethod("getStoredCount"); ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.cache"); ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerCache(), TileCache); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCache(), TileCache); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerCache(), TileCache); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerCache(), TileCache); - } catch (Exception e){ + } catch (Exception e) { Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e); } // XXX : We register the IBlockInfo interface - /* - try{ - IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); - IBlockInfo_getBlockInfo = IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, ForgeDirection.class, EntityPlayer.class, List.class, boolean.class); - - - //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); - - } catch (Exception e){ - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); - } - */ - } - - + /* + * try{ IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); IBlockInfo_getBlockInfo = + * IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, + * ForgeDirection.class, EntityPlayer.class, List.class, boolean.class); + * //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); + * ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo); + * ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); } catch (Exception + * e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); } + */ + } + } diff --git a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java index 0af9a47..8012c30 100644 --- a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java +++ b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java @@ -2,39 +2,44 @@ package mcp.mobius.waila.addons.twilightforest; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; public class TwilightForestGenericOverride implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata()); - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata()); + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + @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) { - return currenttip; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - return tag; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + return tag; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java index 4fa1ce2..eace995 100644 --- a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java +++ b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java @@ -1,37 +1,36 @@ package mcp.mobius.waila.addons.twilightforest; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import org.apache.logging.log4j.Level; + public class TwilightForestModule { - public static Class BlockTFRoots = null; - public static Class BlockTFPlant = null; - public static Class BlockTFSapling = null; - - public static void register(){ + public static Class BlockTFRoots = null; + public static Class BlockTFPlant = null; + public static Class BlockTFSapling = null; - try{ - Class TwilightForestMod = Class.forName("twilightforest.TwilightForestMod"); - Waila.log.log(Level.INFO, "TwilightForestMod mod found."); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found."); - return; - } + public static void register() { - try { - BlockTFRoots = Class.forName("twilightforest.block.BlockTFRoots"); - BlockTFPlant = Class.forName("twilightforest.block.BlockTFPlant"); - BlockTFSapling = Class.forName("twilightforest.block.BlockTFSapling"); - } catch (ClassNotFoundException e) { - Waila.log.log(Level.WARN, "[TwilightForestMod] Class not found. " + e); - } + try { + Class TwilightForestMod = Class.forName("twilightforest.TwilightForestMod"); + Waila.log.log(Level.INFO, "TwilightForestMod mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found."); + return; + } - - ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFRoots); - ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFPlant); - } + try { + BlockTFRoots = Class.forName("twilightforest.block.BlockTFRoots"); + BlockTFPlant = Class.forName("twilightforest.block.BlockTFPlant"); + BlockTFSapling = Class.forName("twilightforest.block.BlockTFSapling"); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[TwilightForestMod] Class not found. " + e); + } + + ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFRoots); + ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFPlant); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java index a560cea..dbabfeb 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java @@ -1,79 +1,80 @@ package mcp.mobius.waila.addons.vanillamc; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.gui.helpers.UIHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; + public class HUDDecoratorVanilla implements IWailaBlockDecorator { - @Override - public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) { + @Override + public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + Tessellator tessellator = Tessellator.instance; + + // UIHelper.drawBillboardText(itemStack.getDisplayName(), accessor.getRenderingPosition(), 0.5F, 1.5F, 0.5F, + // accessor.getPartialFrame()); + UIHelper.drawFloatingText("IN", accessor.getRenderingPosition(), 0.5F, 0.2F, -0.2F, 90F, 0F, 0F); + UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), -0.2F, 0.2F, 0.5F, 90F, 90F, 0F); + UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 1.2F, 0.2F, 0.5F, 90F, -90F, 0F); + UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 0.5F, 0.2F, 1.2F, 90F, -180F, 0F); -Tessellator tessellator = Tessellator.instance; - - //UIHelper.drawBillboardText(itemStack.getDisplayName(), accessor.getRenderingPosition(), 0.5F, 1.5F, 0.5F, accessor.getPartialFrame()); - UIHelper.drawFloatingText("IN", accessor.getRenderingPosition(), 0.5F, 0.2F, -0.2F, 90F, 0F, 0F); - UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), -0.2F, 0.2F, 0.5F, 90F, 90F, 0F); - UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 1.2F, 0.2F, 0.5F, 90F, -90F, 0F); - UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 0.5F, 0.2F, 1.2F, 90F, -180F, 0F); - double offset = 0.1; double delta = 1 + 2 * offset; - + double x = accessor.getRenderingPosition().xCoord - offset; double y = accessor.getRenderingPosition().yCoord - offset; double z = accessor.getRenderingPosition().zCoord - offset; - + tessellator.startDrawingQuads(); tessellator.setColorRGBA(255, 255, 255, 150); - tessellator.addVertex(x, y + 0.2 , z); - tessellator.addVertex(x, y + 0.2 , z + delta/2 - 0.1); - tessellator.addVertex(x + offset, y + 0.2, z + delta/2 - 0.1); - tessellator.addVertex(x + offset, y + 0.2, z); + tessellator.addVertex(x, y + 0.2, z); + tessellator.addVertex(x, y + 0.2, z + delta / 2 - 0.1); + tessellator.addVertex(x + offset, y + 0.2, z + delta / 2 - 0.1); + tessellator.addVertex(x + offset, y + 0.2, z); - tessellator.addVertex(x, y + 0.2 , z + delta/2 + 0.1); - tessellator.addVertex(x, y + 0.2 , z + delta); - tessellator.addVertex(x + offset, y + 0.2, z + delta); - tessellator.addVertex(x + offset, y + 0.2, z + delta/2 + 0.1); + tessellator.addVertex(x, y + 0.2, z + delta / 2 + 0.1); + tessellator.addVertex(x, y + 0.2, z + delta); + tessellator.addVertex(x + offset, y + 0.2, z + delta); + tessellator.addVertex(x + offset, y + 0.2, z + delta / 2 + 0.1); - tessellator.addVertex(x + delta - 0.1, y + 0.2 , z + 0.1); - tessellator.addVertex(x + delta - 0.1, y + 0.2 , z + delta/2 - 0.1); - tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta/2 - 0.1); - tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + 0.1); + tessellator.addVertex(x + delta - 0.1, y + 0.2, z + 0.1); + tessellator.addVertex(x + delta - 0.1, y + 0.2, z + delta / 2 - 0.1); + tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta / 2 - 0.1); + tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + 0.1); - tessellator.addVertex(x + delta - 0.1, y + 0.2 , z + delta/2 + 0.1); - tessellator.addVertex(x + delta - 0.1, y + 0.2 , z + delta); - tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta); - tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta/2 + 0.1); + tessellator.addVertex(x + delta - 0.1, y + 0.2, z + delta / 2 + 0.1); + tessellator.addVertex(x + delta - 0.1, y + 0.2, z + delta); + tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta); + tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta / 2 + 0.1); - - tessellator.addVertex(x+ 0.1, y + 0.2, z); - tessellator.addVertex(x+ 0.1, y + 0.2, z+ offset); - tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2, z+ offset); - tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2, z); + tessellator.addVertex(x + 0.1, y + 0.2, z); + tessellator.addVertex(x + 0.1, y + 0.2, z + offset); + tessellator.addVertex(x + delta / 2 - 0.1, y + 0.2, z + offset); + tessellator.addVertex(x + delta / 2 - 0.1, y + 0.2, z); - tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2, z); - tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2, z+ offset); - tessellator.addVertex(x+ delta, y + 0.2, z+ offset); - tessellator.addVertex(x+ delta, y + 0.2, z); + tessellator.addVertex(x + delta / 2 + 0.1, y + 0.2, z); + tessellator.addVertex(x + delta / 2 + 0.1, y + 0.2, z + offset); + tessellator.addVertex(x + delta, y + 0.2, z + offset); + tessellator.addVertex(x + delta, y + 0.2, z); - tessellator.addVertex(x + 0.1, y + 0.2, z+ delta - 0.1); - tessellator.addVertex(x + 0.1, y + 0.2, z+ offset+ delta - 0.1); - tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2, z+ offset+ delta - 0.1); - tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2, z+ delta - 0.1); + tessellator.addVertex(x + 0.1, y + 0.2, z + delta - 0.1); + tessellator.addVertex(x + 0.1, y + 0.2, z + offset + delta - 0.1); + tessellator.addVertex(x + delta / 2 - 0.1, y + 0.2, z + offset + delta - 0.1); + tessellator.addVertex(x + delta / 2 - 0.1, y + 0.2, z + delta - 0.1); - tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2, z+ delta - 0.1); - tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2, z+ offset+ delta - 0.1); - tessellator.addVertex(x+ delta - 0.1, y + 0.2, z+ offset+ delta - 0.1); - tessellator.addVertex(x+ delta - 0.1, y + 0.2, z+ delta - 0.1); - - tessellator.draw(); - - } + tessellator.addVertex(x + delta / 2 + 0.1, y + 0.2, z + delta - 0.1); + tessellator.addVertex(x + delta / 2 + 0.1, y + 0.2, z + offset + delta - 0.1); + tessellator.addVertex(x + delta - 0.1, y + 0.2, z + offset + delta - 0.1); + tessellator.addVertex(x + delta - 0.1, y + 0.2, z + delta - 0.1); + + tessellator.draw(); + + } } diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java index 2135bdb..ab8b6c3 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java @@ -2,77 +2,94 @@ package mcp.mobius.waila.addons.vanillamc; import java.util.List; -import cpw.mods.fml.common.registry.GameData; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityFurnace; -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.api.SpecialChars; -import mcp.mobius.waila.api.impl.ModuleRegistrar; + +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.world.World; + +import cpw.mods.fml.common.registry.GameData; public class HUDHandlerFurnace implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - int cookTime = accessor.getNBTData().getShort("CookTime"); - NBTTagList tag = accessor.getNBTData().getTagList("Items", 10); - - String renderStr = ""; - { - ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(0)); - String name = GameData.getItemRegistry().getNameForObject(stack.getItem()); - renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage())); - } - { - ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(1)); - String name = GameData.getItemRegistry().getNameForObject(stack.getItem()); - renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage())); - } - - renderStr += SpecialChars.getRenderString("waila.progress", String.valueOf(cookTime), String.valueOf(200)); - - { - ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(2)); - String name = GameData.getItemRegistry().getNameForObject(stack.getItem()); - renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage())); - } - - currenttip.add(renderStr); - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + int cookTime = accessor.getNBTData().getShort("CookTime"); + NBTTagList tag = accessor.getNBTData().getTagList("Items", 10); - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } + String renderStr = ""; + { + ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(0)); + String name = GameData.getItemRegistry().getNameForObject(stack.getItem()); + renderStr += SpecialChars.getRenderString( + "waila.stack", + "1", + name, + String.valueOf(stack.stackSize), + String.valueOf(stack.getItemDamage())); + } + { + ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(1)); + String name = GameData.getItemRegistry().getNameForObject(stack.getItem()); + renderStr += SpecialChars.getRenderString( + "waila.stack", + "1", + name, + String.valueOf(stack.stackSize), + String.valueOf(stack.getItemDamage())); + } - @Override - 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; - } - - public static void register(){ - //ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFurnace(), TileEntityFurnace.class); - //ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerFurnace(), TileEntityFurnace.class); - } + renderStr += SpecialChars.getRenderString("waila.progress", String.valueOf(cookTime), String.valueOf(200)); + + { + ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(2)); + String name = GameData.getItemRegistry().getNameForObject(stack.getItem()); + renderStr += SpecialChars.getRenderString( + "waila.stack", + "1", + name, + String.valueOf(stack.stackSize), + String.valueOf(stack.getItemDamage())); + } + + currenttip.add(renderStr); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } + + public static void register() { + // ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFurnace(), TileEntityFurnace.class); + // ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerFurnace(), TileEntityFurnace.class); + } } diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java index 0611b75..81d54bf 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -2,6 +2,13 @@ package mcp.mobius.waila.addons.vanillamc; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.SpecialChars; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.cbcore.LangUtil; + import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneOre; import net.minecraft.entity.player.EntityPlayerMP; @@ -12,280 +19,274 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; 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.api.SpecialChars; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.cbcore.LangUtil; public class HUDHandlerVanilla implements IWailaDataProvider { - static Block mobSpawner = Blocks.mob_spawner; - static Block crops = Blocks.wheat; - static Block melonStem = Blocks.melon_stem; - static Block pumpkinStem = Blocks.pumpkin_stem; - static Block carrot = Blocks.carrots; - static Block potato = Blocks.potatoes; - static Block lever = Blocks.lever; - static Block repeaterIdle = Blocks.unpowered_repeater; - static Block repeaterActv = Blocks.powered_repeater; - static Block comparatorIdl = Blocks.unpowered_comparator; - static Block comparatorAct = Blocks.powered_comparator; - static Block redstone = Blocks.redstone_wire; - static Block jukebox = Blocks.jukebox; - static Block cocoa = Blocks.cocoa; - static Block netherwart = Blocks.nether_wart; - static Block silverfish = Blocks.monster_egg; - static Block doubleplant = Blocks.double_plant; - static Block leave = Blocks.leaves; - static Block leave2 = Blocks.leaves2; - static Block log = Blocks.log; - static Block log2 = Blocks.log2; - static Block quartz = Blocks.quartz_block; - - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - Block block = accessor.getBlock(); - - if (block == silverfish && config.getConfig("vanilla.silverfish")){ - int metadata = accessor.getMetadata(); - switch(metadata){ - case 0: - return new ItemStack(Blocks.stone); - case 1: - return new ItemStack(Blocks.cobblestone); - case 2: - return new ItemStack(Blocks.brick_block); - default: - return null; - } - } + static Block mobSpawner = Blocks.mob_spawner; + static Block crops = Blocks.wheat; + static Block melonStem = Blocks.melon_stem; + static Block pumpkinStem = Blocks.pumpkin_stem; + static Block carrot = Blocks.carrots; + static Block potato = Blocks.potatoes; + static Block lever = Blocks.lever; + static Block repeaterIdle = Blocks.unpowered_repeater; + static Block repeaterActv = Blocks.powered_repeater; + static Block comparatorIdl = Blocks.unpowered_comparator; + static Block comparatorAct = Blocks.powered_comparator; + static Block redstone = Blocks.redstone_wire; + static Block jukebox = Blocks.jukebox; + static Block cocoa = Blocks.cocoa; + static Block netherwart = Blocks.nether_wart; + static Block silverfish = Blocks.monster_egg; + static Block doubleplant = Blocks.double_plant; + static Block leave = Blocks.leaves; + static Block leave2 = Blocks.leaves2; + static Block log = Blocks.log; + static Block log2 = Blocks.log2; + static Block quartz = Blocks.quartz_block; - if (block == redstone){ - return new ItemStack(Items.redstone); - } - - if (block == doubleplant && (accessor.getMetadata() & 8) != 0){ - int x = accessor.getPosition().blockX; - int y = accessor.getPosition().blockY - 1; - int z = accessor.getPosition().blockZ; - int meta = accessor.getWorld().getBlockMetadata(x, y, z); - - return new ItemStack(doubleplant, 0, meta); - } - - if (block instanceof BlockRedstoneOre){ - return new ItemStack(Blocks.redstone_ore); - } - - if (block == crops ){ - return new ItemStack(Items.wheat); - } - - if ((block == leave || block == leave2) && (accessor.getMetadata() > 3)){ - return new ItemStack(block, 1, accessor.getMetadata() - 4); - } - - if (block == log || block == log2){ - return new ItemStack(block, 1, accessor.getMetadata()%4); - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + Block block = accessor.getBlock(); - if ((block == quartz) && (accessor.getMetadata() > 2)){ - return new ItemStack(block, 1, 2); - } - - return null; - - } + if (block == silverfish && config.getConfig("vanilla.silverfish")) { + int metadata = accessor.getMetadata(); + switch (metadata) { + case 0: + return new ItemStack(Blocks.stone); + case 1: + return new ItemStack(Blocks.cobblestone); + case 2: + return new ItemStack(Blocks.brick_block); + default: + return null; + } + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - Block block = accessor.getBlock(); - - /* 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(); - currenttip.set(0, String.format("%s (%s)", name, mobname)); - } + if (block == redstone) { + return new ItemStack(Items.redstone); + } - if (block == redstone){ - String name = currenttip.get(0).replaceFirst(String.format(" %s", accessor.getMetadata()), ""); - currenttip.set(0, name); - } - - if (block == melonStem){ - currenttip.set(0, SpecialChars.WHITE + "Melon stem"); - } - - if (block == pumpkinStem){ - currenttip.set(0, SpecialChars.WHITE + "Pumpkin stem"); - } - - return currenttip; - } + if (block == doubleplant && (accessor.getMetadata() & 8) != 0) { + int x = accessor.getPosition().blockX; + int y = accessor.getPosition().blockY - 1; + int z = accessor.getPosition().blockZ; + int meta = accessor.getWorld().getBlockMetadata(x, y, z); - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - Block block = accessor.getBlock(); - /* Crops */ - 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)); - else - currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature"))); - return currenttip; - } + return new ItemStack(doubleplant, 0, meta); + } - if (block == cocoa && config.getConfig("general.showcrop")){ - - float growthValue = ((accessor.getMetadata() >> 2) / 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; - } - - 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)); - else - currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature"))); - return currenttip; - } - - if (config.getConfig("vanilla.leverstate")) - if (block == lever){ - String redstoneOn = (accessor.getMetadata() & 8) == 0 ? LangUtil.translateG("hud.msg.off") : LangUtil.translateG("hud.msg.on"); - currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.state"), redstoneOn)); - return currenttip; - } + if (block instanceof BlockRedstoneOre) { + return new ItemStack(Blocks.redstone_ore); + } - if (config.getConfig("vanilla.repeater")) - if ((block == repeaterIdle) ||(block == repeaterActv)){ - int tick = (accessor.getMetadata() >> 2) + 1 ; - if (tick == 1) - currenttip.add(String.format("%s : %s tick", LangUtil.translateG("hud.msg.delay"), tick)); - else - currenttip.add(String.format("%s : %s ticks", LangUtil.translateG("hud.msg.delay"), tick)); - return currenttip; - } + if (block == crops) { + return new ItemStack(Items.wheat); + } - if (config.getConfig("vanilla.comparator")) - if ((block == comparatorIdl) ||(block == comparatorAct)){ - String mode = ((accessor.getMetadata() >> 2) & 1) == 0 ? LangUtil.translateG("hud.msg.comparator") : LangUtil.translateG("hud.msg.substractor"); - //int outputSignal = ((TileEntityComparator)entity).func_96100_a(); - currenttip.add("Mode : " + mode); - //currenttip.add(String.format("Out : %s", outputSignal)); - return currenttip; - } + if ((block == leave || block == leave2) && (accessor.getMetadata() > 3)) { + return new ItemStack(block, 1, accessor.getMetadata() - 4); + } - if (config.getConfig("vanilla.redstone")) - if (block == redstone){ - currenttip.add(String.format("%s : %s" , LangUtil.translateG("hud.msg.power"), accessor.getMetadata())); - return currenttip; - } - - /* - if (config.getConfig("vanilla.jukebox")) - if (block == jukebox){ - NBTTagCompound tag = accessor.getNBTData(); - Item record = null; - if (tag.hasKey("Record")){ - record = Item.itemsList[accessor.getNBTInteger(tag, "Record")]; - currenttip.add(((ItemRecord)record).getRecordTitle()); - } else { - currenttip.add(LangUtil.translateG("hud.msg.empty")); - } - } - */ - - return currenttip; - } + if (block == log || block == log2) { + return new ItemStack(block, 1, accessor.getMetadata() % 4); + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } - - @Override - 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; - } - - public static void register(){ - ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.spawntype"); - 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().registerStackProvider(provider, doubleplant.getClass()); - ModuleRegistrar.instance().registerStackProvider(provider, BlockRedstoneOre.class); - ModuleRegistrar.instance().registerStackProvider(provider, crops.getClass()); - ModuleRegistrar.instance().registerStackProvider(provider, leave.getClass()); - ModuleRegistrar.instance().registerStackProvider(provider, leave2.getClass()); - ModuleRegistrar.instance().registerStackProvider(provider, log.getClass()); - ModuleRegistrar.instance().registerStackProvider(provider, log2.getClass()); - ModuleRegistrar.instance().registerStackProvider(provider, quartz.getClass()); - - //ModuleRegistrar.instance().registerStackProvider(provider, Block.class); - ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass()); - ModuleRegistrar.instance().registerHeadProvider(provider, melonStem.getClass()); - ModuleRegistrar.instance().registerHeadProvider(provider, pumpkinStem.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().registerNBTProvider(provider, mobSpawner.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, crops.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, melonStem.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, pumpkinStem.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, carrot.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, potato.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, lever.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, repeaterIdle.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, repeaterActv.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, comparatorIdl.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, comparatorAct.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, redstone.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, jukebox.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, cocoa.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, netherwart.getClass()); - ModuleRegistrar.instance().registerNBTProvider(provider, silverfish.getClass()); - - //ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv"); - - //ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle); - } + if ((block == quartz) && (accessor.getMetadata() > 2)) { + return new ItemStack(block, 1, 2); + } + return null; + + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + Block block = accessor.getBlock(); + + /* 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(); + currenttip.set(0, String.format("%s (%s)", name, mobname)); + } + + if (block == redstone) { + String name = currenttip.get(0).replaceFirst(String.format(" %s", accessor.getMetadata()), ""); + currenttip.set(0, name); + } + + if (block == melonStem) { + currenttip.set(0, SpecialChars.WHITE + "Melon stem"); + } + + if (block == pumpkinStem) { + currenttip.set(0, SpecialChars.WHITE + "Pumpkin stem"); + } + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + Block block = accessor.getBlock(); + /* Crops */ + 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)); + else currenttip.add( + String.format( + "%s : %s", + LangUtil.translateG("hud.msg.growth"), + LangUtil.translateG("hud.msg.mature"))); + return currenttip; + } + + if (block == cocoa && config.getConfig("general.showcrop")) { + + float growthValue = ((accessor.getMetadata() >> 2) / 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; + } + + 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)); + else currenttip.add( + String.format( + "%s : %s", + LangUtil.translateG("hud.msg.growth"), + LangUtil.translateG("hud.msg.mature"))); + return currenttip; + } + + if (config.getConfig("vanilla.leverstate")) if (block == lever) { + String redstoneOn = (accessor.getMetadata() & 8) == 0 ? LangUtil.translateG("hud.msg.off") + : LangUtil.translateG("hud.msg.on"); + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.state"), redstoneOn)); + return currenttip; + } + + if (config.getConfig("vanilla.repeater")) if ((block == repeaterIdle) || (block == repeaterActv)) { + int tick = (accessor.getMetadata() >> 2) + 1; + if (tick == 1) currenttip.add(String.format("%s : %s tick", LangUtil.translateG("hud.msg.delay"), tick)); + else currenttip.add(String.format("%s : %s ticks", LangUtil.translateG("hud.msg.delay"), tick)); + return currenttip; + } + + if (config.getConfig("vanilla.comparator")) if ((block == comparatorIdl) || (block == comparatorAct)) { + String mode = ((accessor.getMetadata() >> 2) & 1) == 0 ? LangUtil.translateG("hud.msg.comparator") + : LangUtil.translateG("hud.msg.substractor"); + // int outputSignal = ((TileEntityComparator)entity).func_96100_a(); + currenttip.add("Mode : " + mode); + // currenttip.add(String.format("Out : %s", outputSignal)); + return currenttip; + } + + if (config.getConfig("vanilla.redstone")) if (block == redstone) { + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.power"), accessor.getMetadata())); + return currenttip; + } + + /* + * if (config.getConfig("vanilla.jukebox")) if (block == jukebox){ NBTTagCompound tag = accessor.getNBTData(); + * Item record = null; if (tag.hasKey("Record")){ record = Item.itemsList[accessor.getNBTInteger(tag, + * "Record")]; currenttip.add(((ItemRecord)record).getRecordTitle()); } else { + * currenttip.add(LangUtil.translateG("hud.msg.empty")); } } + */ + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + 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; + } + + public static void register() { + ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.spawntype"); + 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().registerStackProvider(provider, doubleplant.getClass()); + ModuleRegistrar.instance().registerStackProvider(provider, BlockRedstoneOre.class); + ModuleRegistrar.instance().registerStackProvider(provider, crops.getClass()); + ModuleRegistrar.instance().registerStackProvider(provider, leave.getClass()); + ModuleRegistrar.instance().registerStackProvider(provider, leave2.getClass()); + ModuleRegistrar.instance().registerStackProvider(provider, log.getClass()); + ModuleRegistrar.instance().registerStackProvider(provider, log2.getClass()); + ModuleRegistrar.instance().registerStackProvider(provider, quartz.getClass()); + + // ModuleRegistrar.instance().registerStackProvider(provider, Block.class); + ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass()); + ModuleRegistrar.instance().registerHeadProvider(provider, melonStem.getClass()); + ModuleRegistrar.instance().registerHeadProvider(provider, pumpkinStem.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().registerNBTProvider(provider, mobSpawner.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, crops.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, melonStem.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, pumpkinStem.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, carrot.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, potato.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, lever.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, repeaterIdle.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, repeaterActv.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, comparatorIdl.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, comparatorAct.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, redstone.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, jukebox.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, cocoa.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, netherwart.getClass()); + ModuleRegistrar.instance().registerNBTProvider(provider, silverfish.getClass()); + + // ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv"); + + // ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle); + } - } diff --git a/src/main/java/mcp/mobius/waila/api/ITaggedList.java b/src/main/java/mcp/mobius/waila/api/ITaggedList.java index 7413c28..543750c 100644 --- a/src/main/java/mcp/mobius/waila/api/ITaggedList.java +++ b/src/main/java/mcp/mobius/waila/api/ITaggedList.java @@ -1,21 +1,30 @@ package mcp.mobius.waila.api; import java.util.Collection; -import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.Map.Entry; public interface ITaggedList extends List { - public boolean add(E e, T tag); - public boolean add(E e, Collection taglst); - public Set getTags(E e); - public Set getTags(int index); - public void addTag(E e, T tag); - public void addTag(int index, T tag); - public void removeTag(E e, T tag); - public void removeTag(int index, T tag); - public Set getEntries(T tag); - public void removeEntries(T tag); - public String getTagsAsString(E e); + + public boolean add(E e, T tag); + + public boolean add(E e, Collection taglst); + + public Set getTags(E e); + + public Set getTags(int index); + + public void addTag(E e, T tag); + + public void addTag(int index, T tag); + + public void removeTag(E e, T tag); + + public void removeTag(int index, T tag); + + public Set getEntries(T tag); + + public void removeEntries(T tag); + + public String getTagsAsString(E e); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaBlock.java b/src/main/java/mcp/mobius/waila/api/IWailaBlock.java index 8b4dd13..f619dad 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaBlock.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaBlock.java @@ -6,29 +6,35 @@ import net.minecraft.item.ItemStack; @Deprecated public interface IWailaBlock { - /* - * 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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); + + /* + * 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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config); + + List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config); + + List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java b/src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java index 7dc6ba0..f0efb5a 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java @@ -5,20 +5,22 @@ import net.minecraft.item.ItemStack; /** * Callback class interface used to provide Block/TileEntity decorator.
* All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be - * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method + * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method * (cf. {@link IWailaRegistrar} documentation for more information). + * * @author ProfMobius * */ public interface IWailaBlockDecorator { - /** - * Callback for the decorator. It provides a standard GL stack positioned on the block.
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerDecorator}.
- * @param itemStack Current block scanned, in ItemStack form. - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - */ - void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config); - + /** + * Callback for the decorator. It provides a standard GL stack positioned on the block.
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerDecorator}.
+ * + * @param itemStack Current block scanned, in ItemStack form. + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + */ + void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config); + } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaCommonAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaCommonAccessor.java index 982f50b..cb9ede8 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaCommonAccessor.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaCommonAccessor.java @@ -12,26 +12,42 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.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).
+ * 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).
* Common accessor for both Entity and Block/TileEntity.
* Available data depends on what it is called upon (ie : getEntity() will return null if looking at a block, etc).
* */ public interface IWailaCommonAccessor { - World getWorld(); - EntityPlayer getPlayer(); - Block getBlock(); - int getBlockID(); - String getBlockQualifiedName(); - int getMetadata(); - TileEntity getTileEntity(); - Entity getEntity(); - MovingObjectPosition getPosition(); - Vec3 getRenderingPosition(); - NBTTagCompound getNBTData(); - int getNBTInteger(NBTTagCompound tag, String keyname); - double getPartialFrame(); - ForgeDirection getSide(); - ItemStack getStack(); + + World getWorld(); + + EntityPlayer getPlayer(); + + Block getBlock(); + + int getBlockID(); + + String getBlockQualifiedName(); + + int getMetadata(); + + TileEntity getTileEntity(); + + Entity getEntity(); + + MovingObjectPosition getPosition(); + + Vec3 getRenderingPosition(); + + NBTTagCompound getNBTData(); + + int getNBTInteger(NBTTagCompound tag, String keyname); + + double getPartialFrame(); + + ForgeDirection getSide(); + + ItemStack getStack(); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java index 9752e42..5a5e992 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java @@ -5,40 +5,43 @@ import java.util.Set; /** * Read-only interface for Waila internal config storage.
- * An instance of this interface is passed to most of Waila callbacks as a way to change the behavior depending on client settings. + * An instance of this interface is passed to most of Waila callbacks as a way to change the behavior depending on + * client settings. * * @author ProfMobius * */ public interface IWailaConfigHandler { - /** Returns a set of all the currently loaded modules in the config handler. - * - * @return - */ - public Set getModuleNames(); - - /** - * Returns all the currently available options for a given module - * - * @param modName Module name - * @return - */ - public HashMap getConfigKeys(String modName); - - /** - * Returns the current value of an option (true/false) with a default value if not set. - * - * @param key Option to lookup - * @param defvalue Default values - * @return Value of the option or defvalue if not set. - */ - public boolean getConfig(String key, boolean defvalue); - - /** - * Returns the current value of an option (true/false) with a default value true if not set - * - * @param key Option to lookup - * @return Value of the option or true if not set. - */ - public boolean getConfig(String key); + + /** + * Returns a set of all the currently loaded modules in the config handler. + * + * @return + */ + public Set getModuleNames(); + + /** + * Returns all the currently available options for a given module + * + * @param modName Module name + * @return + */ + public HashMap getConfigKeys(String modName); + + /** + * Returns the current value of an option (true/false) with a default value if not set. + * + * @param key Option to lookup + * @param defvalue Default values + * @return Value of the option or defvalue if not set. + */ + public boolean getConfig(String key, boolean defvalue); + + /** + * Returns the current value of an option (true/false) with a default value true if not set + * + * @param key Option to lookup + * @return Value of the option or true if not set. + */ + public boolean getConfig(String key); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java index 7b87217..7d27eed 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java @@ -11,27 +11,42 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; /** - * The Accessor is used to get some basic data out of the game without having to request direct access to the game engine.
+ * 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).
* An instance of this interface is passed to most of Waila Block/TileEntity callbacks. + * * @author ProfMobius * */ -public interface IWailaDataAccessor{ - - World getWorld(); - EntityPlayer getPlayer(); - Block getBlock(); - int getBlockID(); - String getBlockQualifiedName(); - int getMetadata(); - TileEntity getTileEntity(); - MovingObjectPosition getPosition(); - Vec3 getRenderingPosition(); - NBTTagCompound getNBTData(); - int getNBTInteger(NBTTagCompound tag, String keyname); - double getPartialFrame(); - ForgeDirection getSide(); - ItemStack getStack(); +public interface IWailaDataAccessor { + + World getWorld(); + + EntityPlayer getPlayer(); + + Block getBlock(); + + int getBlockID(); + + String getBlockQualifiedName(); + + int getMetadata(); + + TileEntity getTileEntity(); + + MovingObjectPosition getPosition(); + + Vec3 getRenderingPosition(); + + NBTTagCompound getNBTData(); + + int getNBTInteger(NBTTagCompound tag, String keyname); + + double getPartialFrame(); + + ForgeDirection getSide(); + + ItemStack getStack(); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java index eb7e98b..574d0fc 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java @@ -11,73 +11,89 @@ import net.minecraft.world.World; /** * Callback class interface used to provide Block/TileEntity tooltip informations to Waila.
* All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be - * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method + * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method * (cf. {@link IWailaRegistrar} documentation for more information). + * * @author ProfMobius * */ -public interface IWailaDataProvider{ - - /** - * Callback used to override the default Waila lookup system.
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerStackProvider}.
- * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return null if override is not required, an ItemStack otherwise. - */ - ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param itemStack Current block scanned, in ItemStack form. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param itemStack Current block scanned, in ItemStack form. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param itemStack Current block scanned, in ItemStack form. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used server side to return a custom synchronization NBTTagCompound.
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerNBTProvider} server and client side.
- * You are supposed to always return the modified input NBTTagCompound tag.
- * @param player The player requesting data synchronization (The owner of the current connection). - * @param te The TileEntity targeted for synchronization. - * @param tag Current synchronization tag (might have been processed by other providers and might be processed by other providers). - * @param world TileEntity's World. - * @param x X position of the TileEntity. - * @param y Y position of the TileEntity. - * @param z Z position of the TileEntity. - * @return Modified input NBTTagCompound tag. - */ - NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z); +public interface IWailaDataProvider { + + /** + * Callback used to override the default Waila lookup system.
+ * Will be used if the implementing class is registered via + * {@link IWailaRegistrar}.{@link registerStackProvider}.
+ * + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return null if override is not required, an ItemStack otherwise. + */ + ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param itemStack Current block scanned, in ItemStack form. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param itemStack Current block scanned, in ItemStack form. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param itemStack Current block scanned, in ItemStack form. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config); + + /** + * Callback used server side to return a custom synchronization NBTTagCompound.
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerNBTProvider} + * server and client side.
+ * You are supposed to always return the modified input NBTTagCompound tag.
+ * + * @param player The player requesting data synchronization (The owner of the current connection). + * @param te The TileEntity targeted for synchronization. + * @param tag Current synchronization tag (might have been processed by other providers and might be processed by + * other providers). + * @param world TileEntity's World. + * @param x X position of the TileEntity. + * @param y Y position of the TileEntity. + * @param z Z position of the TileEntity. + * @return Modified input NBTTagCompound tag. + */ + NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, + int z); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java index a4c0076..e486c4a 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java @@ -8,20 +8,30 @@ 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.
+ * 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).
* An instance of this interface is passed to most of Waila Entity callbacks. + * * @author ProfMobius * */ public interface IWailaEntityAccessor { - World getWorld(); - EntityPlayer getPlayer(); - Entity getEntity(); - MovingObjectPosition getPosition(); - Vec3 getRenderingPosition(); - NBTTagCompound getNBTData(); - int getNBTInteger(NBTTagCompound tag, String keyname); - double getPartialFrame(); + + World getWorld(); + + EntityPlayer getPlayer(); + + Entity getEntity(); + + MovingObjectPosition getPosition(); + + Vec3 getRenderingPosition(); + + NBTTagCompound getNBTData(); + + int getNBTInteger(NBTTagCompound tag, String keyname); + + double getPartialFrame(); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java index 5a9acd8..fb4774c 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java @@ -10,70 +10,85 @@ import net.minecraft.world.World; /** * Callback class interface used to provide Entity tooltip informations to Waila.
* All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be - * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method + * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method * (cf. {@link IWailaRegistrar} documentation for more information). + * * @author ProfMobius * */ public interface IWailaEntityProvider { - - /** - * Callback used to override the default Waila lookup system.
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerOverrideEntityProvider}.
- * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return null if override is not required, an Entity otherwise. - */ - Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param entity Current Entity scanned. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param entity Current Entity scanned. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaBody(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param entity Current Entity scanned. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used server side to return a custom synchronization NBTTagCompound.
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerNBTProvider} server and client side.
- * You are supposed to always return the modified input NBTTagCompound tag.
- * @param player The player requesting data synchronization (The owner of the current connection). - * @param ent The Entity targeted for synchronization. - * @param tag Current synchronization tag (might have been processed by other providers and might be processed by other providers). - * @param world TileEntity's World. - * @return Modified input NBTTagCompound tag. - */ - NBTTagCompound getNBTData(EntityPlayerMP player, Entity ent, NBTTagCompound tag, World world); + + /** + * Callback used to override the default Waila lookup system.
+ * Will be used if the implementing class is registered via + * {@link IWailaRegistrar}.{@link registerOverrideEntityProvider}.
+ * + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return null if override is not required, an Entity otherwise. + */ + Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param entity Current Entity scanned. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, + IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param entity Current Entity scanned. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaBody(Entity entity, List currenttip, IWailaEntityAccessor accessor, + IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param entity Current Entity scanned. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, + IWailaConfigHandler config); + + /** + * Callback used server side to return a custom synchronization NBTTagCompound.
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerNBTProvider} + * server and client side.
+ * You are supposed to always return the modified input NBTTagCompound tag.
+ * + * @param player The player requesting data synchronization (The owner of the current connection). + * @param ent The Entity targeted for synchronization. + * @param tag Current synchronization tag (might have been processed by other providers and might be processed by + * other providers). + * @param world TileEntity's World. + * @return Modified input NBTTagCompound tag. + */ + NBTTagCompound getNBTData(EntityPlayerMP player, Entity ent, NBTTagCompound tag, World world); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java index 99fb5e8..c7028ff 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java @@ -8,22 +8,34 @@ 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.
+ * 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).
* An instance of this interface is passed to most of Waila FMP callbacks. + * * @author ProfMobius * */ 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(); + + World getWorld(); + + EntityPlayer getPlayer(); + + TileEntity getTileEntity(); + + MovingObjectPosition getPosition(); + + NBTTagCompound getNBTData(); + + NBTTagCompound getFullNBTData(); + + int getNBTInteger(NBTTagCompound tag, String keyname); + + double getPartialFrame(); + + Vec3 getRenderingPosition(); + + String getID(); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java index 5484a56..d89e9dd 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java @@ -5,19 +5,21 @@ import net.minecraft.item.ItemStack; /** * Callback class interface used to provide FMP decorator.
* All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be - * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method + * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method * (cf. {@link IWailaRegistrar} documentation for more information). + * * @author ProfMobius * */ public interface IWailaFMPDecorator { - - /** - * Callback for the decorator. It provides a standard GL stack positioned on the block.
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerDecorator}.
- * @param itemStack Current block scanned, in ItemStack form. - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - */ - void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config); + + /** + * Callback for the decorator. It provides a standard GL stack positioned on the block.
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerDecorator}.
+ * + * @param itemStack Current block scanned, in ItemStack form. + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + */ + void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java index 6db02fb..bb745b7 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java @@ -7,48 +7,59 @@ import net.minecraft.item.ItemStack; /** * Callback class interface used to provide FMP tooltip informations to Waila.
* All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be - * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method + * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method * (cf. {@link IWailaRegistrar} documentation for more information). + * * @author ProfMobius * */ public interface IWailaFMPProvider { - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param itemStack Current block scanned, in ItemStack form. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaHead(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param itemStack Current block scanned, in ItemStack form. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaBody(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); - - /** - * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
- * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} client side.
- * You are supposed to always return the modified input currenttip.
- * - * @param itemStack Current block scanned, in ItemStack form. - * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers). - * @param accessor Contains most of the relevant information about the current environment. - * @param config Current configuration of Waila. - * @return Modified input currenttip - */ - List getWailaTail(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param itemStack Current block scanned, in ItemStack form. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaHead(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, + IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param itemStack Current block scanned, in ItemStack form. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaBody(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, + IWailaConfigHandler config); + + /** + * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).
+ * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} + * client side.
+ * You are supposed to always return the modified input currenttip.
+ * + * @param itemStack Current block scanned, in ItemStack form. + * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be + * processed by other providers). + * @param accessor Contains most of the relevant information about the current environment. + * @param config Current configuration of Waila. + * @return Modified input currenttip + */ + List getWailaTail(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, + IWailaConfigHandler config); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java index 66f43ad..3f4ae70 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java @@ -4,74 +4,90 @@ package mcp.mobius.waila.api; * Main registration interface. An instance will be provided to a method specified in an IMC msg formatted as follow
* FMLInterModComms.sendMessage("Waila", "register", "fully.qualified.path.to.registration.method");
* The registration method need to follow this signature
- * public static void callbackRegister({@link IWailaRegistrar} registrar)

- * If not specified otherwise, all the registration methods taking a class can take classes as well as interfaces. - * Waila will do a lookup using instanceof on the registered classes, meaning that if all your targets inherit one interface, you only need - * to specify it to cover the whole hierarchy.
- * For the registration of blocks, both Blocks and TileEntities are accepted.

+ * public static void callbackRegister({@link IWailaRegistrar} registrar) + *

+ * If not specified otherwise, all the registration methods taking a class can take classes as well as interfaces. Waila + * will do a lookup using instanceof on the registered classes, meaning that if all your targets inherit one interface, + * you only need to specify it to cover the whole hierarchy.
+ * For the registration of blocks, both Blocks and TileEntities are accepted. + *

* For the configuration keys :
* modname refers to a String used for display in Waila's config panel.
- * keyname refers to an unique key used internally for config query (cf {@link IWailaConfigHandler}). Those keys are shared across Waila, keep them unique !
+ * keyname refers to an unique key used internally for config query (cf {@link IWailaConfigHandler}). Those keys are + * shared across Waila, keep them unique !
* * * @author ProfMobius * */ public interface IWailaRegistrar { - /* Add a config option in the section modname with displayed text configtext and access key keyname */ - public void addConfig(String modname, String keyname, String configtext); - public void addConfig(String modname, String keyname, String configtext, boolean defvalue); - public void addConfigRemote(String modname, String keyname, String configtext); - public void addConfigRemote(String modname, String keyname, String configtext, boolean defvalue); - public void addConfig(String modname, String keyname); - public void addConfig(String modname, String keyname, boolean defvalue); - public void addConfigRemote(String modname, String keyname); - public void addConfigRemote(String modname, String keyname, boolean defvalue); - - /* Register a stack overrider for the given 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); - /* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */ - public void registerNBTProvider(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); + /* Add a config option in the section modname with displayed text configtext and access key keyname */ + public void addConfig(String modname, String keyname, String configtext); - /* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */ - public void registerNBTProvider(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 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 - * - * This registration method is deprecated in favor to registerNBTProvider. - * It will be removed in MC 1.8 !!! - * */ - @Deprecated - public void registerSyncedNBTKey(String key, Class target); - - public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer); - - /* UNUSED FOR NOW (Will be used for the ingame wiki */ - //public void registerDocTextFile (String filename); - //public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item); + public void addConfig(String modname, String keyname, String configtext, boolean defvalue); + + public void addConfigRemote(String modname, String keyname, String configtext); + + public void addConfigRemote(String modname, String keyname, String configtext, boolean defvalue); + + public void addConfig(String modname, String keyname); + + public void addConfig(String modname, String keyname, boolean defvalue); + + public void addConfigRemote(String modname, String keyname); + + public void addConfigRemote(String modname, String keyname, boolean defvalue); + + /* Register a stack overrider for the given 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); + + /* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */ + public void registerNBTProvider(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); + + /* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */ + public void registerNBTProvider(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 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 This registration method + * is deprecated in favor to registerNBTProvider. It will be removed in MC 1.8 !!! + */ + @Deprecated + public void registerSyncedNBTKey(String key, Class target); + + public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer); + + /* UNUSED FOR NOW (Will be used for the ingame wiki */ + // public void registerDocTextFile (String filename); + // public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java index f790649..8a25864 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java @@ -5,17 +5,18 @@ import java.util.LinkedHashMap; import net.minecraft.item.ItemStack; public interface IWailaSummaryProvider { - /* This interface is used to control the display data in the description screen */ - - /* BASIC TOOLS & ITEMS DATA */ - //EnumToolMaterial getMaterial(ItemStack stack); - //String getMaterialName(ItemStack stack); - //String getEffectiveBlock(ItemStack stack); - //int getHarvestLevel(ItemStack stack); - //float getEfficiencyOnProperMaterial(ItemStack stack); - //int getEnchantability(ItemStack stack); - //int getDamageVsEntity(ItemStack stack); - //int getDurability(ItemStack stack); - - LinkedHashMap getSummary(ItemStack stack, LinkedHashMap currentSummary, IWailaConfigHandler config); + /* This interface is used to control the display data in the description screen */ + + /* BASIC TOOLS & ITEMS DATA */ + // EnumToolMaterial getMaterial(ItemStack stack); + // String getMaterialName(ItemStack stack); + // String getEffectiveBlock(ItemStack stack); + // int getHarvestLevel(ItemStack stack); + // float getEfficiencyOnProperMaterial(ItemStack stack); + // int getEnchantability(ItemStack stack); + // int getDamageVsEntity(ItemStack stack); + // int getDurability(ItemStack stack); + + LinkedHashMap getSummary(ItemStack stack, LinkedHashMap currentSummary, + IWailaConfigHandler config); } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java b/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java index 700a278..a0d341f 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java @@ -1,24 +1,25 @@ package mcp.mobius.waila.api; import java.awt.Dimension; -import java.awt.Point; - public interface IWailaTooltipRenderer { - /** - * - * @param params Array of string parameters as passed to the RENDER arg in the tooltip ({rendername,param1,param2,...}) - * @param accessor A global accessor for TileEntities and Entities - * @return Dimension of the reserved area - */ - Dimension getSize(String[] params, IWailaCommonAccessor accessor); - - /** - * Draw method for the renderer. The GL matrice is automatically moved to the top left of the reserved zone.
- * All calls should be relative to (0,0) - * - * @param params Array of string parameters as passed to the RENDER arg in the tooltip ({rendername,param1,param2,...}) - * @param accessor A global accessor for TileEntities and Entities - */ - void draw (String[] params, IWailaCommonAccessor accessor); + + /** + * + * @param params Array of string parameters as passed to the RENDER arg in the tooltip + * ({rendername,param1,param2,...}) + * @param accessor A global accessor for TileEntities and Entities + * @return Dimension of the reserved area + */ + Dimension getSize(String[] params, IWailaCommonAccessor accessor); + + /** + * Draw method for the renderer. The GL matrice is automatically moved to the top left of the reserved zone.
+ * All calls should be relative to (0,0) + * + * @param params Array of string parameters as passed to the RENDER arg in the tooltip + * ({rendername,param1,param2,...}) + * @param accessor A global accessor for TileEntities and Entities + */ + void draw(String[] params, IWailaCommonAccessor accessor); } diff --git a/src/main/java/mcp/mobius/waila/api/SpecialChars.java b/src/main/java/mcp/mobius/waila/api/SpecialChars.java index f2630cc..450f877 100644 --- a/src/main/java/mcp/mobius/waila/api/SpecialChars.java +++ b/src/main/java/mcp/mobius/waila/api/SpecialChars.java @@ -7,64 +7,80 @@ import java.util.regex.Pattern; public class SpecialChars { - public static String MCStyle = "\u00A7"; - - public static String BLACK = MCStyle + "0"; - public static String DBLUE = MCStyle + "1"; - public static String DGREEN = MCStyle + "2"; - public static String DAQUA = MCStyle + "3"; - public static String DRED = MCStyle + "4"; - public static String DPURPLE = MCStyle + "5"; - public static String GOLD = MCStyle + "6"; - public static String GRAY = MCStyle + "7"; - public static String DGRAY = MCStyle + "8"; - public static String BLUE = MCStyle + "9"; - public static String GREEN = MCStyle + "a"; - public static String AQUA = MCStyle + "b"; - public static String RED = MCStyle + "c"; - public static String LPURPLE = MCStyle + "d"; - public static String YELLOW = MCStyle + "e"; - public static String WHITE = MCStyle + "f"; - - public static String OBF = MCStyle + "k"; - public static String BOLD = MCStyle + "l"; - public static String STRIKE = MCStyle + "m"; - public static String UNDER = MCStyle + "n"; - public static String ITALIC = MCStyle + "o"; - public static String RESET = MCStyle + "r"; + public static String MCStyle = "\u00A7"; - public static String WailaStyle = "\u00A4"; - public static String WailaIcon = "\u00A5"; - public static String WailaRenderer = "\u00A6"; - 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"; - public static String RENDER = WailaStyle + WailaRenderer +"a"; - - public static final Pattern patternMinecraft = Pattern.compile("(?i)" + MCStyle + "[0-9A-FK-OR]"); - public static final Pattern patternWaila = Pattern.compile("(?i)(" + WailaStyle + "(?..))"); - public static final Pattern patternRender = Pattern.compile("(?i)(" + RENDER + "\\{(?[^,}]*),?(?[^}]*)\\})"); - public static final Pattern patternTab = Pattern.compile("(?i)" + TAB); - public static final Pattern patternRight = Pattern.compile("(?i)" + ALIGNRIGHT); - public static final Pattern patternCenter = Pattern.compile("(?i)" + ALIGNCENTER); - public static final Pattern patternIcon = Pattern.compile("(?i)(" + WailaStyle + WailaIcon + "(?[0-9a-z]))"); - public static final Pattern patternLineSplit = Pattern.compile("(?i)(" + WailaStyle + WailaStyle + "[^" + WailaStyle + "]+|" + WailaStyle + WailaIcon + "[0-9A-Z]|" + WailaStyle + WailaRenderer + "a\\{([^,}]*),?([^}]*)\\}|[^" + WailaStyle + "]+)"); - - /** - * Helper method to get a proper RENDER string. Just put the name of the renderer and the params in, and it will give back a directly usable String for the tooltip. - * @param name - * @param params - * @return - */ - public static String getRenderString(String name, String... params){ - String result = RENDER + "{" + name; - for (String s : params){ - result += "," + s; - } - result += "}"; - return result; - } + public static String BLACK = MCStyle + "0"; + public static String DBLUE = MCStyle + "1"; + public static String DGREEN = MCStyle + "2"; + public static String DAQUA = MCStyle + "3"; + public static String DRED = MCStyle + "4"; + public static String DPURPLE = MCStyle + "5"; + public static String GOLD = MCStyle + "6"; + public static String GRAY = MCStyle + "7"; + public static String DGRAY = MCStyle + "8"; + public static String BLUE = MCStyle + "9"; + public static String GREEN = MCStyle + "a"; + public static String AQUA = MCStyle + "b"; + public static String RED = MCStyle + "c"; + public static String LPURPLE = MCStyle + "d"; + public static String YELLOW = MCStyle + "e"; + public static String WHITE = MCStyle + "f"; + + public static String OBF = MCStyle + "k"; + public static String BOLD = MCStyle + "l"; + public static String STRIKE = MCStyle + "m"; + public static String UNDER = MCStyle + "n"; + public static String ITALIC = MCStyle + "o"; + public static String RESET = MCStyle + "r"; + + public static String WailaStyle = "\u00A4"; + public static String WailaIcon = "\u00A5"; + public static String WailaRenderer = "\u00A6"; + 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"; + public static String RENDER = WailaStyle + WailaRenderer + "a"; + + public static final Pattern patternMinecraft = Pattern.compile("(?i)" + MCStyle + "[0-9A-FK-OR]"); + public static final Pattern patternWaila = Pattern.compile("(?i)(" + WailaStyle + "(?..))"); + public static final Pattern patternRender = Pattern + .compile("(?i)(" + RENDER + "\\{(?[^,}]*),?(?[^}]*)\\})"); + public static final Pattern patternTab = Pattern.compile("(?i)" + TAB); + public static final Pattern patternRight = Pattern.compile("(?i)" + ALIGNRIGHT); + public static final Pattern patternCenter = Pattern.compile("(?i)" + ALIGNCENTER); + public static final Pattern patternIcon = Pattern.compile("(?i)(" + WailaStyle + WailaIcon + "(?[0-9a-z]))"); + public static final Pattern patternLineSplit = Pattern.compile( + "(?i)(" + WailaStyle + + WailaStyle + + "[^" + + WailaStyle + + "]+|" + + WailaStyle + + WailaIcon + + "[0-9A-Z]|" + + WailaStyle + + WailaRenderer + + "a\\{([^,}]*),?([^}]*)\\}|[^" + + WailaStyle + + "]+)"); + + /** + * Helper method to get a proper RENDER string. Just put the name of the renderer and the params in, and it will + * give back a directly usable String for the tooltip. + * + * @param name + * @param params + * @return + */ + public static String getRenderString(String name, String... params) { + String result = RENDER + "{" + name; + for (String s : params) { + result += "," + s; + } + result += "}"; + return result; + } } diff --git a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java index fb9eda8..973781f 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java @@ -5,171 +5,173 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Set; -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.config.Configuration; import net.minecraftforge.common.config.Property; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + public class ConfigHandler implements IWailaConfigHandler { - /* SINGLETON */ - private static ConfigHandler _instance = null; - private ConfigHandler() { _instance = this; } - public static ConfigHandler instance(){ return _instance == null ? new ConfigHandler() : _instance; } - /* === */ - - private LinkedHashMap modules = new LinkedHashMap(); - private ArrayList serverconfigs = new ArrayList(); - public HashMap forcedConfigs = new HashMap(); - public Configuration config = null; - - - public void addModule(String modName, HashMap options){ - this.addModule(modName, new ConfigModule(modName, options)); - } + /* SINGLETON */ + private static ConfigHandler _instance = null; - public void addModule(String modName, ConfigModule options){ - this.modules.put(modName, options); - } - - @Override - public Set getModuleNames(){ - return this.modules.keySet(); - } - - @Override - public HashMap getConfigKeys(String modName){ - if (this.modules.containsKey(modName)) - return this.modules.get(modName).options; - else - return null; - } - - private void saveModuleKey(String modName, String key){ - this.saveModuleKey(modName, key, Constants.CFG_DEFAULT_VALUE); - } - - private void saveModuleKey(String modName, String key, boolean defvalue){ - config.get(Constants.CATEGORY_MODULES, key, defvalue); - config.get(Constants.CATEGORY_SERVER , key, Constants.SERVER_FREE); - config.save(); - } + private ConfigHandler() { + _instance = this; + } - public void addConfig(String modName, String key, String name){ - this.addConfig(modName, key, name, Constants.CFG_DEFAULT_VALUE); - } - - public void addConfig(String modName, String key, String name, boolean defvalue){ - this.saveModuleKey(modName, key, defvalue); - - if (!this.modules.containsKey(modName)) - this.modules.put(modName, new ConfigModule(modName)); - - this.modules.get(modName).addOption(key, name); - } + public static ConfigHandler instance() { + return _instance == null ? new ConfigHandler() : _instance; + } + /* === */ - public void addConfigServer(String modName, String key, String name){ - this.addConfigServer(modName, key, name, Constants.CFG_DEFAULT_VALUE); - } - - public void addConfigServer(String modName, String key, String name, boolean defvalue){ - this.saveModuleKey(modName, key, defvalue); - - if (!this.modules.containsKey(modName)) - this.modules.put(modName, new ConfigModule(modName)); - - this.modules.get(modName).addOption(key, name); - this.serverconfigs.add(key); - } - - @Override - public boolean getConfig(String key){ - return this.getConfig(key, Constants.CFG_DEFAULT_VALUE); - } - - @Override - public boolean getConfig(String key, boolean defvalue){ - if (this.serverconfigs.contains(key) && !Waila.instance.serverPresent) - return false; - - 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); - } + private LinkedHashMap modules = new LinkedHashMap(); + private ArrayList serverconfigs = new ArrayList(); + public HashMap forcedConfigs = new HashMap(); + public Configuration config = null; - - - - - - /* 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 getConfig(String category, String key, int default_){ - Property prop = config.get(category, key, default_); - return prop.getInt(); - } - - 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 addModule(String modName, HashMap options) { + this.addModule(modName, new ConfigModule(modName, options)); + } - - /* Some accessor helpers */ - public boolean showTooltip(){ - return getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true); - } - - - - /* 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); - config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, 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; + public void addModule(String modName, ConfigModule options) { + this.modules.put(modName, options); + } - 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(); - } + @Override + public Set getModuleNames() { + return this.modules.keySet(); + } + + @Override + public HashMap getConfigKeys(String modName) { + if (this.modules.containsKey(modName)) return this.modules.get(modName).options; + else return null; + } + + private void saveModuleKey(String modName, String key) { + this.saveModuleKey(modName, key, Constants.CFG_DEFAULT_VALUE); + } + + private void saveModuleKey(String modName, String key, boolean defvalue) { + config.get(Constants.CATEGORY_MODULES, key, defvalue); + config.get(Constants.CATEGORY_SERVER, key, Constants.SERVER_FREE); + config.save(); + } + + public void addConfig(String modName, String key, String name) { + this.addConfig(modName, key, name, Constants.CFG_DEFAULT_VALUE); + } + + public void addConfig(String modName, String key, String name, boolean defvalue) { + this.saveModuleKey(modName, key, defvalue); + + if (!this.modules.containsKey(modName)) this.modules.put(modName, new ConfigModule(modName)); + + this.modules.get(modName).addOption(key, name); + } + + public void addConfigServer(String modName, String key, String name) { + this.addConfigServer(modName, key, name, Constants.CFG_DEFAULT_VALUE); + } + + public void addConfigServer(String modName, String key, String name, boolean defvalue) { + this.saveModuleKey(modName, key, defvalue); + + if (!this.modules.containsKey(modName)) this.modules.put(modName, new ConfigModule(modName)); + + this.modules.get(modName).addOption(key, name); + this.serverconfigs.add(key); + } + + @Override + public boolean getConfig(String key) { + return this.getConfig(key, Constants.CFG_DEFAULT_VALUE); + } + + @Override + public boolean getConfig(String key, boolean defvalue) { + if (this.serverconfigs.contains(key) && !Waila.instance.serverPresent) return false; + + 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); + } + + /* 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 getConfig(String category, String key, int default_) { + Property prop = config.get(category, key, default_); + return prop.getInt(); + } + + 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(); + } + + /* Some accessor helpers */ + public boolean showTooltip() { + return getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true); + } + + /* 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); + config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, 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(); + } } diff --git a/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java index b6b1f55..0a7d035 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java @@ -4,21 +4,21 @@ import java.util.HashMap; public class ConfigModule { - String modName; - HashMap options; - - public ConfigModule(String _modName){ - this.modName = _modName; - this.options = new HashMap(); - } - - public ConfigModule(String _modName, HashMap _options) { - this.modName = _modName; - this.options = _options; - } + String modName; + HashMap options; + + public ConfigModule(String _modName) { + this.modName = _modName; + this.options = new HashMap(); + } + + public ConfigModule(String _modName, HashMap _options) { + this.modName = _modName; + this.options = _options; + } + + public void addOption(String key, String name) { + this.options.put(key, name); + } - public void addOption(String key, String name){ - this.options.put(key,name); - } - } diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java index 544cae0..47939a4 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java @@ -1,6 +1,10 @@ package mcp.mobius.waila.api.impl; -import cpw.mods.fml.common.registry.GameData; +import mcp.mobius.waila.api.IWailaCommonAccessor; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.utils.NBTUtil; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -13,186 +17,201 @@ import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import mcp.mobius.waila.api.IWailaCommonAccessor; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaEntityAccessor; -import mcp.mobius.waila.utils.NBTUtil; -public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAccessor, IWailaEntityAccessor{ +import cpw.mods.fml.common.registry.GameData; - public World world; - public EntityPlayer player; - public MovingObjectPosition mop; - public Vec3 renderingvec = null; - public Block block; - public int blockID; - public String blockResource; - public int metadata; - public TileEntity tileEntity; - public Entity entity; - public NBTTagCompound remoteNbt = null; - public long timeLastUpdate = System.currentTimeMillis(); - public double partialFrame; - public ItemStack stack; - - public static DataAccessorCommon instance = new DataAccessorCommon(); - - 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; - - if (this.mop.typeOfHit == MovingObjectType.BLOCK){ - this.block = world.getBlock(_mop.blockX, _mop.blockY, _mop.blockZ); - this.metadata = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ); - this.tileEntity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ); - this.entity = null; - this.blockID = Block.getIdFromBlock(this.block); - this.blockResource = GameData.getBlockRegistry().getNameForObject(this.block); - try{ this.stack = new ItemStack(this.block, 1, this.metadata); } catch (Exception e) {} - - } else if (this.mop.typeOfHit == MovingObjectType.ENTITY){ - this.block = null; - this.metadata = -1; - this.tileEntity = null; - this.stack = null; - 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;} +public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAccessor, IWailaEntityAccessor { - @Override - public EntityPlayer getPlayer() {return this.player;} + public World world; + public EntityPlayer player; + public MovingObjectPosition mop; + public Vec3 renderingvec = null; + public Block block; + public int blockID; + public String blockResource; + public int metadata; + public TileEntity tileEntity; + public Entity entity; + public NBTTagCompound remoteNbt = null; + public long timeLastUpdate = System.currentTimeMillis(); + public double partialFrame; + public ItemStack stack; - @Override - public Block getBlock() {return this.block;} + public static DataAccessorCommon instance = new DataAccessorCommon(); - @Override - public int getBlockID() {return this.blockID;} + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) { + this.set(_world, _player, _mop, null, 0.0); + } - @Override - public int getMetadata() {return this.metadata;} + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, EntityLivingBase viewEntity, + double partialTicks) { + this.world = _world; + this.player = _player; + this.mop = _mop; - @Override - public TileEntity getTileEntity() { return this.tileEntity;} + if (this.mop.typeOfHit == MovingObjectType.BLOCK) { + this.block = world.getBlock(_mop.blockX, _mop.blockY, _mop.blockZ); + this.metadata = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ); + this.tileEntity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ); + this.entity = null; + this.blockID = Block.getIdFromBlock(this.block); + this.blockResource = GameData.getBlockRegistry().getNameForObject(this.block); + try { + this.stack = new ItemStack(this.block, 1, this.metadata); + } catch (Exception e) {} - @Override - public Entity getEntity() {return this.entity;} + } else if (this.mop.typeOfHit == MovingObjectType.ENTITY) { + this.block = null; + this.metadata = -1; + this.tileEntity = null; + this.stack = null; + this.entity = _mop.entityHit; + } - @Override - public MovingObjectPosition getPosition() {return this.mop;} + 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 Vec3 getRenderingPosition() {return this.renderingvec;} + @Override + public World getWorld() { + return this.world; + } - @Override - public NBTTagCompound getNBTData() { - if ((this.tileEntity != null) && this.isTagCorrectTileEntity(this.remoteNbt)) - return remoteNbt; - - if ((this.entity != null) && this.isTagCorrectEntity(this.remoteNbt)) - return remoteNbt; - - if (this.tileEntity != null){ - NBTTagCompound tag = new NBTTagCompound(); - try{ - this.tileEntity.writeToNBT(tag); - } catch (Exception e){} - return tag; - } - - if (this.entity != null){ - NBTTagCompound tag = new NBTTagCompound(); - this.entity.writeToNBT(tag); - return tag; - } - - return null; - } + @Override + public EntityPlayer getPlayer() { + return this.player; + } - public void setNBTData(NBTTagCompound tag){ - this.remoteNbt = tag; - } - - private boolean isTagCorrectTileEntity(NBTTagCompound tag){ - if (tag == null || !tag.hasKey("WailaX")){ - this.timeLastUpdate = System.currentTimeMillis() - 250; - return false; - } - - int x = tag.getInteger("WailaX"); - int y = tag.getInteger("WailaY"); - int z = tag.getInteger("WailaZ"); - - if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ) - return true; - else { - this.timeLastUpdate = System.currentTimeMillis() - 250; - return false; - } - } - - private boolean isTagCorrectEntity(NBTTagCompound tag){ - if (tag == null || !tag.hasKey("WailaEntityID")){ - this.timeLastUpdate = System.currentTimeMillis() - 250; - return false; - } - - int id = tag.getInteger("WailaEntityID"); - - if (id == this.entity.getEntityId()) - 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 Block getBlock() { + return this.block; + } - @Override - public double getPartialFrame() { - return this.partialFrame; - } + @Override + public int getBlockID() { + return this.blockID; + } - @Override - public ForgeDirection getSide() { - return ForgeDirection.getOrientation(this.getPosition().sideHit); - } + @Override + public int getMetadata() { + return this.metadata; + } - @Override - public ItemStack getStack() { - return this.stack; - } + @Override + public TileEntity getTileEntity() { + return this.tileEntity; + } - public boolean isTimeElapsed(long time){ - return System.currentTimeMillis() - this.timeLastUpdate >= time; - } - - public void resetTimer(){ - this.timeLastUpdate = System.currentTimeMillis(); - } + @Override + public Entity getEntity() { + return this.entity; + } + + @Override + public MovingObjectPosition getPosition() { + return this.mop; + } + + @Override + public Vec3 getRenderingPosition() { + return this.renderingvec; + } + + @Override + public NBTTagCompound getNBTData() { + if ((this.tileEntity != null) && this.isTagCorrectTileEntity(this.remoteNbt)) return remoteNbt; + + if ((this.entity != null) && this.isTagCorrectEntity(this.remoteNbt)) return remoteNbt; + + if (this.tileEntity != null) { + NBTTagCompound tag = new NBTTagCompound(); + try { + this.tileEntity.writeToNBT(tag); + } catch (Exception e) {} + return tag; + } + + if (this.entity != null) { + NBTTagCompound tag = new NBTTagCompound(); + this.entity.writeToNBT(tag); + return tag; + } + + return null; + } + + public void setNBTData(NBTTagCompound tag) { + this.remoteNbt = tag; + } + + private boolean isTagCorrectTileEntity(NBTTagCompound tag) { + if (tag == null || !tag.hasKey("WailaX")) { + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + + int x = tag.getInteger("WailaX"); + int y = tag.getInteger("WailaY"); + int z = tag.getInteger("WailaZ"); + + if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ) return true; + else { + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + } + + private boolean isTagCorrectEntity(NBTTagCompound tag) { + if (tag == null || !tag.hasKey("WailaEntityID")) { + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + + int id = tag.getInteger("WailaEntityID"); + + if (id == this.entity.getEntityId()) 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 double getPartialFrame() { + return this.partialFrame; + } + + @Override + public ForgeDirection getSide() { + return ForgeDirection.getOrientation(this.getPosition().sideHit); + } + + @Override + public ItemStack getStack() { + return this.stack; + } + + public boolean isTimeElapsed(long time) { + return System.currentTimeMillis() - this.timeLastUpdate >= time; + } + + public void resetTimer() { + this.timeLastUpdate = System.currentTimeMillis(); + } + + @Override + public String getBlockQualifiedName() { + return this.blockResource; + } - @Override - public String getBlockQualifiedName() { - return this.blockResource; - } - } diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java index b6ad9c6..0529e22 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java @@ -1,116 +1,117 @@ package mcp.mobius.waila.api.impl; +import mcp.mobius.waila.api.IWailaFMPAccessor; +import mcp.mobius.waila.utils.NBTUtil; + import net.minecraft.entity.player.EntityPlayer; 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 { - - String id; - World world; - EntityPlayer player; - MovingObjectPosition mop; - Vec3 renderingvec = null; - TileEntity entity; - NBTTagCompound partialNBT = null; - NBTTagCompound remoteNBT = null; - long timeLastUpdate = System.currentTimeMillis(); - 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.getTileEntity(_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; - } + String id; + World world; + EntityPlayer player; + MovingObjectPosition mop; + Vec3 renderingvec = null; + TileEntity entity; + NBTTagCompound partialNBT = null; + NBTTagCompound remoteNBT = null; + long timeLastUpdate = System.currentTimeMillis(); + double partialFrame; - @Override - public TileEntity getTileEntity() { - return this.entity; - } + public static DataAccessorFMP instance = new DataAccessorFMP(); - @Override - public MovingObjectPosition getPosition() { - return this.mop; - } + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT, + String id) { + this.set(_world, _player, _mop, _partialNBT, id, null, 0.0); + } - @Override - public NBTTagCompound getNBTData() { - return this.partialNBT; - } + 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.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ); + this.partialNBT = _partialNBT; + this.id = id; + this.renderingvec = renderVec; + this.partialFrame = partialTicks; + } - @Override - public NBTTagCompound getFullNBTData() { - if (this.entity == null) return null; - - if (this.isTagCorrect(this.remoteNBT)) - return this.remoteNBT; + @Override + public World getWorld() { + return this.world; + } - NBTTagCompound tag = new NBTTagCompound(); - this.entity.writeToNBT(tag); - return tag; - } + @Override + public EntityPlayer getPlayer() { + return this.player; + } - @Override - public int getNBTInteger(NBTTagCompound tag, String keyname) { - return NBTUtil.getNBTInteger(tag, keyname); - } + @Override + public TileEntity getTileEntity() { + return this.entity; + } - @Override - public double getPartialFrame() { - return this.partialFrame; - } + @Override + public MovingObjectPosition getPosition() { + return this.mop; + } - @Override - public Vec3 getRenderingPosition() { - return this.renderingvec; - } + @Override + public NBTTagCompound getNBTData() { + return this.partialNBT; + } - @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; - } - } + @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; + } + } } diff --git a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java index 8f82286..7a0e059 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java +++ b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java @@ -1,6 +1,5 @@ package mcp.mobius.waila.api.impl; -import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -14,8 +13,8 @@ import mcp.mobius.waila.cbcore.Layout; import mcp.mobius.waila.network.Message0x01TERequest; import mcp.mobius.waila.network.Message0x03EntRequest; import mcp.mobius.waila.network.WailaPacketHandler; -import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.WailaExceptionHandler; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -24,224 +23,214 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.config.Configuration; -public class MetaDataProvider{ - - private Map> headBlockProviders = new TreeMap>(); - private Map> bodyBlockProviders = new TreeMap>(); - private Map> tailBlockProviders = new TreeMap>(); - - private Map> headEntityProviders = new TreeMap>(); - private Map> bodyEntityProviders = new TreeMap>(); - private Map> tailEntityProviders = new TreeMap>(); - - private Class prevBlock = null; - private Class prevTile = null; - - public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon accessor) { - Block block = accessor.getBlock(); - int blockID = accessor.getBlockID(); - - if (IWailaBlock.class.isInstance(block)){ - try{ - return ((IWailaBlock)block).getWailaStack(accessor, ConfigHandler.instance()); - }catch (Throwable e){ - WailaExceptionHandler.handleErr(e, block.getClass().toString(), null); - } - } +public class MetaDataProvider { - if(ModuleRegistrar.instance().hasStackProviders(block)){ - for (List providerList : ModuleRegistrar.instance().getStackProviders(block).values()){ - for (IWailaDataProvider dataProvider : providerList){ - try{ - ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance()); - if (retval != null) - return retval; - }catch (Throwable e){ - WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), null); - } - } - } - } - return null; - } + private Map> headBlockProviders = new TreeMap>(); + private Map> bodyBlockProviders = new TreeMap>(); + private Map> tailBlockProviders = new TreeMap>(); - public List handleBlockTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon accessor, List currenttip, Layout layout) { - Block block = accessor.getBlock(); - - if (accessor.getTileEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250) && ConfigHandler.instance().showTooltip()){ - accessor.resetTimer(); - HashSet keys = new HashSet(); - - if (ModuleRegistrar.instance().hasSyncedNBTKeys(block)) - keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(block)); + private Map> headEntityProviders = new TreeMap>(); + private Map> bodyEntityProviders = new TreeMap>(); + private Map> tailEntityProviders = new TreeMap>(); - if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getTileEntity())) - keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getTileEntity())); - - if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTProviders(block) || ModuleRegistrar.instance().hasNBTProviders(accessor.getTileEntity())) - WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity(), keys)); - - } else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250) && ConfigHandler.instance().showTooltip()) { - - try{ - NBTTagCompound tag = new NBTTagCompound(); - accessor.getTileEntity().writeToNBT(tag); - accessor.setNBTData(tag); - } catch (Exception e){ - WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); - } - } + private Class prevBlock = null; + private Class prevTile = null; - /* Interface IWailaBlock */ - if (IWailaBlock.class.isInstance(block)){ - TileEntity entity = world.getTileEntity(mop.blockX, mop.blockY, mop.blockZ); - if (layout == Layout.HEADER) - try{ - return ((IWailaBlock)block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); - } - else if (layout == Layout.BODY) - try{ - return ((IWailaBlock)block).getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); - } - else if (layout == Layout.FOOTER) - try{ - return ((IWailaBlock)block).getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); - } - } + public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop, + DataAccessorCommon accessor) { + Block block = accessor.getBlock(); + int blockID = accessor.getBlockID(); - headBlockProviders.clear(); - bodyBlockProviders.clear(); - tailBlockProviders.clear(); - - /* Lookup by class (for blocks)*/ - if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block)) - headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(block)); + if (IWailaBlock.class.isInstance(block)) { + try { + return ((IWailaBlock) block).getWailaStack(accessor, ConfigHandler.instance()); + } catch (Throwable e) { + WailaExceptionHandler.handleErr(e, block.getClass().toString(), null); + } + } - else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block)) - bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(block)); + if (ModuleRegistrar.instance().hasStackProviders(block)) { + for (List providerList : ModuleRegistrar.instance().getStackProviders(block).values()) { + for (IWailaDataProvider dataProvider : providerList) { + try { + ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance()); + if (retval != null) return retval; + } catch (Throwable e) { + WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), null); + } + } + } + } + return null; + } - else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block)) - tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(block)); + public List handleBlockTextData(ItemStack itemStack, World world, EntityPlayer player, + MovingObjectPosition mop, DataAccessorCommon accessor, List currenttip, Layout layout) { + Block block = accessor.getBlock(); - - /* Lookup by class (for tileentities)*/ - if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity())) - headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity())); + if (accessor.getTileEntity() != null && Waila.instance.serverPresent + && accessor.isTimeElapsed(250) + && ConfigHandler.instance().showTooltip()) { + accessor.resetTimer(); + HashSet keys = new HashSet(); - else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity())) - bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity())); - - else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity())) - tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity())); - - /* Apply all collected providers */ - if (layout == Layout.HEADER) - for (List providersList : headBlockProviders.values()){ - for (IWailaDataProvider dataProvider : providersList) - try{ - currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } - } + if (ModuleRegistrar.instance().hasSyncedNBTKeys(block)) + keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(block)); - if (layout == Layout.BODY) - for (List providersList : bodyBlockProviders.values()){ - for (IWailaDataProvider dataProvider : providersList) - try{ - currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } - } - if (layout == Layout.FOOTER) - for (List providersList : tailBlockProviders.values()){ - for (IWailaDataProvider dataProvider : providersList) - try{ - currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } - } - return currenttip; - } - - public List handleEntityTextData(Entity entity, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon accessor, List currenttip, Layout layout) { - - if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){ - accessor.resetTimer(); - HashSet keys = new HashSet(); + if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getTileEntity())) + keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getTileEntity())); - if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getEntity())) - keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getEntity())); - - if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTEntityProviders(accessor.getEntity())) - WailaPacketHandler.INSTANCE.sendToServer(new Message0x03EntRequest(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); - } - } + if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTProviders(block) + || ModuleRegistrar.instance().hasNBTProviders(accessor.getTileEntity())) + WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity(), keys)); - headEntityProviders.clear(); - bodyEntityProviders.clear(); - tailEntityProviders.clear(); - - /* Lookup by class (for entities)*/ - if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadEntityProviders(entity)) - headEntityProviders.putAll(ModuleRegistrar.instance().getHeadEntityProviders(entity)); + } else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent + && accessor.isTimeElapsed(250) + && ConfigHandler.instance().showTooltip()) { - else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity)) - bodyEntityProviders.putAll(ModuleRegistrar.instance().getBodyEntityProviders(entity)); + try { + NBTTagCompound tag = new NBTTagCompound(); + accessor.getTileEntity().writeToNBT(tag); + accessor.setNBTData(tag); + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); + } + } - else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity)) - tailEntityProviders.putAll(ModuleRegistrar.instance().getTailEntityProviders(entity)); + /* Interface IWailaBlock */ + if (IWailaBlock.class.isInstance(block)) { + TileEntity entity = world.getTileEntity(mop.blockX, mop.blockY, mop.blockZ); + if (layout == Layout.HEADER) try { + return ((IWailaBlock) block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e) { + return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); + } + else if (layout == Layout.BODY) try { + return ((IWailaBlock) block).getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e) { + return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); + } + else if (layout == Layout.FOOTER) try { + return ((IWailaBlock) block).getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e) { + return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); + } + } - /* Apply all collected providers */ - if (layout == Layout.HEADER) - for (List providersList : headEntityProviders.values()){ - for (IWailaEntityProvider dataProvider : providersList) - try{ - currenttip = dataProvider.getWailaHead(entity, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } - } + headBlockProviders.clear(); + bodyBlockProviders.clear(); + tailBlockProviders.clear(); - if (layout == Layout.BODY) - for (List providersList : bodyEntityProviders.values()){ - for (IWailaEntityProvider dataProvider : providersList) - 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 (List providersList : tailEntityProviders.values()){ - for (IWailaEntityProvider dataProvider : providersList) - try{ - currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } - } - - return currenttip; - } + /* Lookup by class (for blocks) */ + if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block)) + headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(block)); + + else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block)) + bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(block)); + + else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block)) + tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(block)); + + /* Lookup by class (for tileentities) */ + if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity())) + headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity())); + + else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity())) + bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity())); + + else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity())) + tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity())); + + /* Apply all collected providers */ + if (layout == Layout.HEADER) for (List providersList : headBlockProviders.values()) { + for (IWailaDataProvider dataProvider : providersList) try { + currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e) { + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } + + if (layout == Layout.BODY) for (List providersList : bodyBlockProviders.values()) { + for (IWailaDataProvider dataProvider : providersList) try { + currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e) { + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } + if (layout == Layout.FOOTER) for (List providersList : tailBlockProviders.values()) { + for (IWailaDataProvider dataProvider : providersList) try { + currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e) { + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } + return currenttip; + } + + public List handleEntityTextData(Entity entity, World world, EntityPlayer player, MovingObjectPosition mop, + DataAccessorCommon accessor, List currenttip, Layout layout) { + + if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)) { + accessor.resetTimer(); + HashSet keys = new HashSet(); + + if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getEntity())) + keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getEntity())); + + if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTEntityProviders(accessor.getEntity())) + WailaPacketHandler.INSTANCE.sendToServer(new Message0x03EntRequest(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.putAll(ModuleRegistrar.instance().getHeadEntityProviders(entity)); + + else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity)) + bodyEntityProviders.putAll(ModuleRegistrar.instance().getBodyEntityProviders(entity)); + + else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity)) + tailEntityProviders.putAll(ModuleRegistrar.instance().getTailEntityProviders(entity)); + + /* Apply all collected providers */ + if (layout == Layout.HEADER) for (List providersList : headEntityProviders.values()) { + for (IWailaEntityProvider dataProvider : providersList) 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 (List providersList : bodyEntityProviders.values()) { + for (IWailaEntityProvider dataProvider : providersList) 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 (List providersList : tailEntityProviders.values()) { + for (IWailaEntityProvider dataProvider : providersList) try { + currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e) { + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } + + return currenttip; + } } diff --git a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java index 50c96e2..72b7648 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; @@ -13,9 +12,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.logging.log4j.Level; - -import au.com.bytecode.opencsv.CSVReader; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaDataProvider; @@ -27,518 +23,464 @@ import mcp.mobius.waila.api.IWailaSummaryProvider; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.utils.Constants; +import au.com.bytecode.opencsv.CSVReader; public class ModuleRegistrar implements IWailaRegistrar { - private static ModuleRegistrar instance = null; + private static ModuleRegistrar instance = null; - public LinkedHashMap> headBlockProviders = new LinkedHashMap>(); - public LinkedHashMap> bodyBlockProviders = new LinkedHashMap>(); - public LinkedHashMap> tailBlockProviders = new LinkedHashMap>(); - public LinkedHashMap> stackBlockProviders = new LinkedHashMap>(); - public LinkedHashMap> NBTDataProviders = new LinkedHashMap>(); - - public LinkedHashMap> blockClassDecorators = new LinkedHashMap>(); - - public LinkedHashMap> headEntityProviders = new LinkedHashMap>(); - public LinkedHashMap> bodyEntityProviders = new LinkedHashMap>(); - public LinkedHashMap> tailEntityProviders = new LinkedHashMap>(); - public LinkedHashMap> overrideEntityProviders = new LinkedHashMap>(); - public LinkedHashMap> NBTEntityProviders = new LinkedHashMap>(); - - public LinkedHashMap> headFMPProviders = new LinkedHashMap>(); - public LinkedHashMap> bodyFMPProviders = new LinkedHashMap>(); - public LinkedHashMap> tailFMPProviders = new LinkedHashMap>(); + public LinkedHashMap> headBlockProviders = new LinkedHashMap>(); + public LinkedHashMap> bodyBlockProviders = new LinkedHashMap>(); + public LinkedHashMap> tailBlockProviders = new LinkedHashMap>(); + public LinkedHashMap> stackBlockProviders = new LinkedHashMap>(); + public LinkedHashMap> NBTDataProviders = new LinkedHashMap>(); - public LinkedHashMap> FMPClassDecorators = new LinkedHashMap>(); - - public LinkedHashMap> syncedNBTKeys = new LinkedHashMap>(); - - public LinkedHashMap>> wikiDescriptions = new LinkedHashMap>>(); - public LinkedHashMap> summaryProviders = new LinkedHashMap>(); - - public LinkedHashMap IMCRequests = new LinkedHashMap(); - - public LinkedHashMap tooltipRenderers = new LinkedHashMap(); - - private ModuleRegistrar() { - instance = this; - } + public LinkedHashMap> blockClassDecorators = new LinkedHashMap>(); - public static ModuleRegistrar instance(){ - if (ModuleRegistrar.instance == null) - ModuleRegistrar.instance = new ModuleRegistrar(); - return ModuleRegistrar.instance; - } + public LinkedHashMap> headEntityProviders = new LinkedHashMap>(); + public LinkedHashMap> bodyEntityProviders = new LinkedHashMap>(); + public LinkedHashMap> tailEntityProviders = new LinkedHashMap>(); + public LinkedHashMap> overrideEntityProviders = new LinkedHashMap>(); + public LinkedHashMap> NBTEntityProviders = new LinkedHashMap>(); - /* IMC HANDLING */ - public void addIMCRequest(String method, String modname){ - this.IMCRequests.put(method, modname); - } - - /* CONFIG HANDLING */ - @Override - public void addConfig(String modname, String key, String configname) { - this.addConfig(modname, key, configname, Constants.CFG_DEFAULT_VALUE); - } + public LinkedHashMap> headFMPProviders = new LinkedHashMap>(); + public LinkedHashMap> bodyFMPProviders = new LinkedHashMap>(); + public LinkedHashMap> tailFMPProviders = new LinkedHashMap>(); - @Override - public void addConfigRemote(String modname, String key, String configname) { - this.addConfigRemote(modname, key, configname, Constants.CFG_DEFAULT_VALUE); - } - - @Override - public void addConfig(String modname, String key) { - this.addConfig(modname, key, Constants.CFG_DEFAULT_VALUE); - } + public LinkedHashMap> FMPClassDecorators = new LinkedHashMap>(); - @Override - public void addConfigRemote(String modname, String key) { - this.addConfigRemote(modname, key, Constants.CFG_DEFAULT_VALUE); - } - - @Override - public void addConfig(String modname, String key, String configname, boolean defvalue) { - ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG(configname), defvalue); - } + public LinkedHashMap> syncedNBTKeys = new LinkedHashMap>(); - @Override - public void addConfigRemote(String modname, String key, String configname, boolean defvalue) { - ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG(configname), defvalue); - } - - @Override - public void addConfig(String modname, String key, boolean defvalue) { - ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG("option." + key), defvalue); - } + public LinkedHashMap>> wikiDescriptions = new LinkedHashMap>>(); + public LinkedHashMap> summaryProviders = new LinkedHashMap>(); - @Override - public void addConfigRemote(String modname, String key, boolean defvalue) { - ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG("option." + key), defvalue); - } - - - /* REGISTRATION METHODS */ - @Override - public void registerHeadProvider(IWailaDataProvider dataProvider, Class block) { - this.registerProvider(dataProvider, block, this.headBlockProviders); - } + public LinkedHashMap IMCRequests = new LinkedHashMap(); - @Override - public void registerBodyProvider(IWailaDataProvider dataProvider, Class block) { - this.registerProvider(dataProvider, block, this.bodyBlockProviders); - } - - @Override - public void registerTailProvider(IWailaDataProvider dataProvider, Class block) { - this.registerProvider(dataProvider, block, this.tailBlockProviders); - } - - @Override - public void registerStackProvider(IWailaDataProvider dataProvider, Class block) { - this.registerProvider(dataProvider, block, this.stackBlockProviders); - } + public LinkedHashMap tooltipRenderers = new LinkedHashMap(); - @Override - public void registerNBTProvider(IWailaDataProvider dataProvider, Class entity) { - this.registerProvider(dataProvider, entity, this.NBTDataProviders); - } - - @Override - public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity) { - this.registerProvider(dataProvider, entity, this.headEntityProviders); - } + private ModuleRegistrar() { + instance = this; + } - @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 registerNBTProvider(IWailaEntityProvider dataProvider, Class entity) { - this.registerProvider(dataProvider, entity, this.NBTEntityProviders); - } - - @Override - public void registerHeadProvider(IWailaFMPProvider dataProvider, String name) { - this.registerProvider(dataProvider, name, this.headFMPProviders); - } + public static ModuleRegistrar instance() { + if (ModuleRegistrar.instance == null) ModuleRegistrar.instance = new ModuleRegistrar(); + return ModuleRegistrar.instance; + } - @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); - } + /* IMC HANDLING */ + public void addIMCRequest(String method, String modname) { + this.IMCRequests.put(method, modname); + } - /* - @Override - public void registerShortDataProvider(IWailaSummaryProvider dataProvider, Class item) { - this.registerProvider(dataProvider, item, this.summaryProviders); - } - */ + /* CONFIG HANDLING */ + @Override + public void addConfig(String modname, String key, String configname) { + this.addConfig(modname, key, configname, Constants.CFG_DEFAULT_VALUE); + } - @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 void registerProvider(T dataProvider, V clazz, LinkedHashMap> target) { - if (clazz == null || dataProvider == null) - throw new RuntimeException(String.format("Trying to register a null provider or null block ! Please check the stacktrace to know what was the original registration method. [Provider : %s, Target : %s]", dataProvider.getClass().getName(), clazz)); - - if (!target.containsKey(clazz)) - target.put(clazz, new ArrayList()); - - ArrayList providers =target.get(clazz); - if (providers.contains(dataProvider)) return; - - target.get(clazz).add(dataProvider); - } - - @Deprecated - @Override - public void registerSyncedNBTKey(String key, Class target){ - if (!this.syncedNBTKeys.containsKey(target)) - this.syncedNBTKeys.put(target, new HashSet()); - - this.syncedNBTKeys.get(target).add(key); - } - - @Override - public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer){ - if (!this.tooltipRenderers.containsKey(name)) - this.tooltipRenderers.put(name, renderer); - else - Waila.log.warn(String.format("A renderer named %s already exists (Class : %s). Skipping new renderer.", name, renderer.getClass().getName())); - } - - /* PROVIDER GETTERS */ - - public Map> getHeadProviders(Object block) { - return getProviders(block, this.headBlockProviders); - } + @Override + public void addConfigRemote(String modname, String key, String configname) { + this.addConfigRemote(modname, key, configname, Constants.CFG_DEFAULT_VALUE); + } - public Map> getBodyProviders(Object block) { - return getProviders(block, this.bodyBlockProviders); - } + @Override + public void addConfig(String modname, String key) { + this.addConfig(modname, key, Constants.CFG_DEFAULT_VALUE); + } - public Map> getTailProviders(Object block) { - return getProviders(block, this.tailBlockProviders); - } + @Override + public void addConfigRemote(String modname, String key) { + this.addConfigRemote(modname, key, Constants.CFG_DEFAULT_VALUE); + } - public Map> getStackProviders(Object block) { - return getProviders(block, this.stackBlockProviders); - } - - public Map> getNBTProviders(Object block) { - return getProviders(block, this.NBTDataProviders); - } - - public Map> getHeadEntityProviders(Object entity) { - return getProviders(entity, this.headEntityProviders); - } + @Override + public void addConfig(String modname, String key, String configname, boolean defvalue) { + ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG(configname), defvalue); + } - public Map> getBodyEntityProviders(Object entity) { - return getProviders(entity, this.bodyEntityProviders); - } + @Override + public void addConfigRemote(String modname, String key, String configname, boolean defvalue) { + ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG(configname), defvalue); + } - public Map> getTailEntityProviders(Object entity) { - return getProviders(entity, this.tailEntityProviders); - } - - public Map> getOverrideEntityProviders(Object entity) { - return getProviders(entity, this.overrideEntityProviders); - } + @Override + public void addConfig(String modname, String key, boolean defvalue) { + ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG("option." + key), defvalue); + } - public Map> getNBTEntityProviders(Object entity) { - return getProviders(entity, this.NBTEntityProviders); - } - - public Map> getHeadFMPProviders(String name) { - return getProviders(name, this.headFMPProviders); - } - - public Map> getBodyFMPProviders(String name) { - return getProviders(name, this.bodyFMPProviders); - } + @Override + public void addConfigRemote(String modname, String key, boolean defvalue) { + ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG("option." + key), defvalue); + } - public Map> getTailFMPProviders(String name) { - return getProviders(name, this.tailFMPProviders); - } - - public Map> getSummaryProvider(Object item){ - return getProviders(item, this.summaryProviders); - } - - public Map> getBlockDecorators(Object block){ - return getProviders(block, this.blockClassDecorators); - } - - public Map> getFMPDecorators(String name){ - return getProviders(name, this.FMPClassDecorators); - } - - public IWailaTooltipRenderer getTooltipRenderer(String name){ - return this.tooltipRenderers.get(name); - } - - private Map> getProviders(Object obj, LinkedHashMap> target){ - Map> returnList = new TreeMap>(); - Integer index = 0; - - for (Class clazz : target.keySet()){ - if (clazz.isInstance(obj)) - returnList.put(index, target.get(clazz)); - - index++; - } - - return returnList; - } - - private Map> getProviders(String name, LinkedHashMap> target){ - Map> returnList = new TreeMap>(); - returnList.put(0, target.get(name)); - return returnList; - } - - @Deprecated - public HashSet getSyncedNBTKeys(Object target){ - HashSet returnList = new HashSet(); - 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){ - return hasProviders(block, this.stackBlockProviders); - } - - public boolean hasHeadProviders(Object block){ - return hasProviders(block, this.headBlockProviders); - } - - public boolean hasBodyProviders(Object block){ - return hasProviders(block, this.bodyBlockProviders); - } + /* REGISTRATION METHODS */ + @Override + public void registerHeadProvider(IWailaDataProvider dataProvider, Class block) { + this.registerProvider(dataProvider, block, this.headBlockProviders); + } - public boolean hasTailProviders(Object block){ - return hasProviders(block, this.tailBlockProviders); - } + @Override + public void registerBodyProvider(IWailaDataProvider dataProvider, Class block) { + this.registerProvider(dataProvider, block, this.bodyBlockProviders); + } - public boolean hasNBTProviders(Object block){ - return hasProviders(block, this.NBTDataProviders); - } - - public boolean hasHeadEntityProviders(Object entity){ - return hasProviders(entity, this.headEntityProviders); - } - - public boolean hasBodyEntityProviders(Object entity){ - return hasProviders(entity, this.bodyEntityProviders); - } + @Override + public void registerTailProvider(IWailaDataProvider dataProvider, Class block) { + this.registerProvider(dataProvider, block, this.tailBlockProviders); + } - public boolean hasTailEntityProviders(Object entity){ - return hasProviders(entity, this.tailEntityProviders); - } + @Override + public void registerStackProvider(IWailaDataProvider dataProvider, Class block) { + this.registerProvider(dataProvider, block, this.stackBlockProviders); + } - public boolean hasOverrideEntityProviders(Object entity){ - return hasProviders(entity, this.overrideEntityProviders); - } - - public boolean hasNBTEntityProviders(Object entity){ - return hasProviders(entity, this.NBTEntityProviders); - } - - public boolean hasHeadFMPProviders(String name){ - return hasProviders(name, this.headFMPProviders); - } - - public boolean hasBodyFMPProviders(String name){ - return hasProviders(name, this.bodyFMPProviders); - } + @Override + public void registerNBTProvider(IWailaDataProvider dataProvider, Class entity) { + this.registerProvider(dataProvider, entity, this.NBTDataProviders); + } - public boolean hasTailFMPProviders(String name){ - return hasProviders(name, this.tailFMPProviders); - } + @Override + public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity) { + this.registerProvider(dataProvider, entity, this.headEntityProviders); + } - public boolean hasBlockDecorator(Object block){ - return hasProviders(block, this.blockClassDecorators); - } + @Override + public void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity) { + this.registerProvider(dataProvider, entity, this.bodyEntityProviders); + } - public boolean hasFMPDecorator(String name){ - return hasProviders(name, this.FMPClassDecorators); - } - - private boolean hasProviders(Object obj, LinkedHashMap> target){ - for (Class clazz : target.keySet()) - if (clazz.isInstance(obj)) - return true; - return false; - } - - private boolean hasProviders(String name, LinkedHashMap> target){ - return target.containsKey(name); - } - - public boolean hasSummaryProvider(Class item){ - return this.summaryProviders.containsKey(item); - } - - @Deprecated - 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 docData = null; - int nentries = 0; - - - try{ - docData = this.readFileAsString(filename); - } catch (IOException e){ - Waila.log.log(Level.WARN, String.format("Error while accessing file %s : %s", filename, e)); - return; - } + @Override + public void registerTailProvider(IWailaEntityProvider dataProvider, Class entity) { + this.registerProvider(dataProvider, entity, this.tailEntityProviders); + } - 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 >()); - if (!this.wikiDescriptions.get(modid).containsKey(name)) - this.wikiDescriptions.get(modid).put(name, new LinkedHashMap()); - - 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 ()); -// 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)); - } - */ + @Override + public void registerNBTProvider(IWailaEntityProvider dataProvider, Class entity) { + this.registerProvider(dataProvider, entity, this.NBTEntityProviders); + } - public boolean hasDocTextModID(String modid){ - return this.wikiDescriptions.containsKey(modid); - } + @Override + public void registerHeadProvider(IWailaFMPProvider dataProvider, String name) { + this.registerProvider(dataProvider, name, this.headFMPProviders); + } - public boolean hasDocTextItem(String modid, String item){ - if (this.hasDocTextModID(modid)) - return this.wikiDescriptions.get(modid).containsKey(item); - return false; - } - - public boolean hasDocTextMeta(String modid, String item, String meta){ - if (this.hasDocTextItem(modid, item)) - return this.wikiDescriptions.get(modid).get(item).containsKey(meta); - return false; - } + @Override + public void registerBodyProvider(IWailaFMPProvider dataProvider, String name) { + this.registerProvider(dataProvider, name, this.bodyFMPProviders); + } - public LinkedHashMap getDocText(String modid, String name){ - return this.wikiDescriptions.get(modid).get(name); - } - - public String getDocText(String modid, String name, String meta){ - return this.wikiDescriptions.get(modid).get(name).get(meta); - } - - public boolean hasDocTextSpecificMeta(String modid, String name, String meta){ - for (String s : this.getDocText(modid, name).keySet()) - if (s.equals(meta)) - return true; - return false; - } - - public String getDoxTextWildcardMatch(String modid, String name){ - Set keys = this.wikiDescriptions.get(modid).keySet(); - for (String s : keys){ - String regexed = s; - regexed = regexed.replace(".", "\\."); - regexed = regexed.replace("*", ".*"); - - if (name.matches(s)) - return s; - } - return null; - } - - private List 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 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); + @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) { + * this.registerProvider(dataProvider, item, this.summaryProviders); } + */ + + @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 void registerProvider(T dataProvider, V clazz, LinkedHashMap> target) { + if (clazz == null || dataProvider == null) throw new RuntimeException( + String.format( + "Trying to register a null provider or null block ! Please check the stacktrace to know what was the original registration method. [Provider : %s, Target : %s]", + dataProvider.getClass().getName(), + clazz)); + + if (!target.containsKey(clazz)) target.put(clazz, new ArrayList()); + + ArrayList providers = target.get(clazz); + if (providers.contains(dataProvider)) return; + + target.get(clazz).add(dataProvider); + } + + @Deprecated + @Override + public void registerSyncedNBTKey(String key, Class target) { + if (!this.syncedNBTKeys.containsKey(target)) this.syncedNBTKeys.put(target, new HashSet()); + + this.syncedNBTKeys.get(target).add(key); + } + + @Override + public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer) { + if (!this.tooltipRenderers.containsKey(name)) this.tooltipRenderers.put(name, renderer); + else Waila.log.warn( + String.format( + "A renderer named %s already exists (Class : %s). Skipping new renderer.", + name, + renderer.getClass().getName())); + } + + /* PROVIDER GETTERS */ + + public Map> getHeadProviders(Object block) { + return getProviders(block, this.headBlockProviders); + } + + public Map> getBodyProviders(Object block) { + return getProviders(block, this.bodyBlockProviders); + } + + public Map> getTailProviders(Object block) { + return getProviders(block, this.tailBlockProviders); + } + + public Map> getStackProviders(Object block) { + return getProviders(block, this.stackBlockProviders); + } + + public Map> getNBTProviders(Object block) { + return getProviders(block, this.NBTDataProviders); + } + + public Map> getHeadEntityProviders(Object entity) { + return getProviders(entity, this.headEntityProviders); + } + + public Map> getBodyEntityProviders(Object entity) { + return getProviders(entity, this.bodyEntityProviders); + } + + public Map> getTailEntityProviders(Object entity) { + return getProviders(entity, this.tailEntityProviders); + } + + public Map> getOverrideEntityProviders(Object entity) { + return getProviders(entity, this.overrideEntityProviders); + } + + public Map> getNBTEntityProviders(Object entity) { + return getProviders(entity, this.NBTEntityProviders); + } + + public Map> getHeadFMPProviders(String name) { + return getProviders(name, this.headFMPProviders); + } + + public Map> getBodyFMPProviders(String name) { + return getProviders(name, this.bodyFMPProviders); + } + + public Map> getTailFMPProviders(String name) { + return getProviders(name, this.tailFMPProviders); + } + + public Map> getSummaryProvider(Object item) { + return getProviders(item, this.summaryProviders); + } + + public Map> getBlockDecorators(Object block) { + return getProviders(block, this.blockClassDecorators); + } + + public Map> getFMPDecorators(String name) { + return getProviders(name, this.FMPClassDecorators); + } + + public IWailaTooltipRenderer getTooltipRenderer(String name) { + return this.tooltipRenderers.get(name); + } + + private Map> getProviders(Object obj, LinkedHashMap> target) { + Map> returnList = new TreeMap>(); + Integer index = 0; + + for (Class clazz : target.keySet()) { + if (clazz.isInstance(obj)) returnList.put(index, target.get(clazz)); + + index++; } - input.close(); - return fileData.toString(); - */ - } + + return returnList; + } + + private Map> getProviders(String name, LinkedHashMap> target) { + Map> returnList = new TreeMap>(); + returnList.put(0, target.get(name)); + return returnList; + } + + @Deprecated + public HashSet getSyncedNBTKeys(Object target) { + HashSet returnList = new HashSet(); + 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) { + return hasProviders(block, this.stackBlockProviders); + } + + public boolean hasHeadProviders(Object block) { + return hasProviders(block, this.headBlockProviders); + } + + public boolean hasBodyProviders(Object block) { + return hasProviders(block, this.bodyBlockProviders); + } + + public boolean hasTailProviders(Object block) { + return hasProviders(block, this.tailBlockProviders); + } + + public boolean hasNBTProviders(Object block) { + return hasProviders(block, this.NBTDataProviders); + } + + 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 hasNBTEntityProviders(Object entity) { + return hasProviders(entity, this.NBTEntityProviders); + } + + 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 boolean hasProviders(Object obj, LinkedHashMap> target) { + for (Class clazz : target.keySet()) if (clazz.isInstance(obj)) return true; + return false; + } + + private boolean hasProviders(String name, LinkedHashMap> target) { + return target.containsKey(name); + } + + public boolean hasSummaryProvider(Class item) { + return this.summaryProviders.containsKey(item); + } + + @Deprecated + 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 docData = null; int nentries = 0; + * try{ docData = this.readFileAsString(filename); } catch (IOException e){ Waila.log.log(Level.WARN, + * 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 >()); if + * (!this.wikiDescriptions.get(modid).containsKey(name)) this.wikiDescriptions.get(modid).put(name, new + * LinkedHashMap()); 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 ()); // 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) { + return this.wikiDescriptions.containsKey(modid); + } + + public boolean hasDocTextItem(String modid, String item) { + if (this.hasDocTextModID(modid)) return this.wikiDescriptions.get(modid).containsKey(item); + return false; + } + + public boolean hasDocTextMeta(String modid, String item, String meta) { + if (this.hasDocTextItem(modid, item)) return this.wikiDescriptions.get(modid).get(item).containsKey(meta); + return false; + } + + public LinkedHashMap getDocText(String modid, String name) { + return this.wikiDescriptions.get(modid).get(name); + } + + public String getDocText(String modid, String name, String meta) { + return this.wikiDescriptions.get(modid).get(name).get(meta); + } + + public boolean hasDocTextSpecificMeta(String modid, String name, String meta) { + for (String s : this.getDocText(modid, name).keySet()) if (s.equals(meta)) return true; + return false; + } + + public String getDoxTextWildcardMatch(String modid, String name) { + Set keys = this.wikiDescriptions.get(modid).keySet(); + for (String s : keys) { + String regexed = s; + regexed = regexed.replace(".", "\\."); + regexed = regexed.replace("*", ".*"); + + if (name.matches(s)) return s; + } + return null; + } + + private List 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 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(); + */ + } } diff --git a/src/main/java/mcp/mobius/waila/api/impl/TipList.java b/src/main/java/mcp/mobius/waila/api/impl/TipList.java index ea3a06a..ad64252 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/TipList.java +++ b/src/main/java/mcp/mobius/waila/api/impl/TipList.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -12,195 +11,141 @@ import java.util.Set; import mcp.mobius.waila.api.ITaggedList; public class TipList extends ArrayList implements ITaggedList { - Map> tags = new HashMap(); - - @Override - public boolean add(E e, T tag){ - if (!tags.containsKey(e)) - tags.put(e, new HashSet()); - tags.get(e).add(tag); - return super.add(e); - } - @Override - public boolean add(E e, Collection taglst){ - if (!tags.containsKey(e)) - tags.put(e, new HashSet()); - tags.get(e).addAll(taglst); - - return super.add(e); - } - - @Override - public Set getTags(E e){ - Set ret = tags.get(e); - if (ret == null && this.contains(e)){ - tags.put(e, new HashSet()); - ret = tags.get(e); - } - return ret; - } - - @Override - public Set getTags(int index){ - return this.getTags(this.get(index)); - } - - @Override - public void addTag(E e, T tag){ - if (this.contains(e) && !tags.containsKey(e)) - tags.put(e, new HashSet()); - - tags.get(e).add(tag); - } - - @Override - public void addTag(int index, T tag){ - this.addTag(this.get(index), tag); - } - - @Override - public void removeTag(E e, T tag){ - if (this.contains(e) && !tags.containsKey(e)) - tags.put(e, new HashSet()); + Map> tags = new HashMap(); - tags.get(e).remove(tag); - } - - @Override - public void removeTag(int index, T tag){ - this.removeTag(this.get(index), tag); - } - - @Override - public Set getEntries(T tag){ - Set ret = new HashSet(); - for (Entry> s : tags.entrySet()){ - if (s.getValue().contains(tag)) - ret.add(s.getKey()); - } - return ret; - } - - @Override - public void removeEntries(T tag){ - for (E e : this.getEntries(tag)) - this.remove(e); - } - - @Override - public String getTagsAsString(E e){ - String ret = ""; - for (T s : tags.get(e)) - ret += s.toString() + ","; - - if (ret.length() > 0) - ret = ret.substring(0, ret.length()-1); - - return ret; - } - - @Override - public void clear(){ - tags.clear(); - super.clear(); - } - - @Override - public E set(int index, E element){ - tags.remove(this.get(index)); - return super.set(index, element); - } - - @Override - public E remove(int index){ - tags.remove(this.get(index)); - return super.remove(index); - } - - @Override - public boolean remove(Object o){ - tags.remove(o); - return super.remove(o); - } - - @Override - public boolean removeAll(Collection c){ - for (Object o : c) - tags.remove(o); - - return super.removeAll(c); - } - - @Override - protected void removeRange(int fromIndex, int toIndex){ - for (int i = fromIndex; i < toIndex; i++) - tags.remove(this.get(i)); - - super.removeRange(fromIndex, toIndex); - } - - @Override - public boolean retainAll(Collection c){ - for (E e : tags.keySet()) - if (!c.contains(e)) - tags.remove(e); - - return super.retainAll(c); - } - - /* - public boolean add(E e){ - this.setInitialTag(e); - return super.add(e); - } - - public void add(int index, E element){ - this.setInitialTag(element); - super.add(index, element); - } - - public boolean addAll(Collection c){ - if (c instanceof TipList){ - for (E e : c) - tags.put(e, ((TipList)c).getTags(e)); - } else { - for (E e : c) - this.setInitialTag(e); - } - - return super.addAll(c); - } - - public boolean addAll(int index, Collection c){ - if (c instanceof TipList){ - for (E e : c) - tags.put(e, ((TipList)c).getTags(e)); - } else { - for (E e : c) - this.setInitialTag(e); - } - - return super.addAll(index, c); - } - - public void clear(){ - tags.clear(); - super.clear(); - } - - public Object clone(){ - return super.clone(); - } - + @Override + public boolean add(E e, T tag) { + if (!tags.containsKey(e)) tags.put(e, new HashSet()); + tags.get(e).add(tag); + return super.add(e); + } - - private void setInitialTag(E key){ - tags.put(key, new ArrayList()); - } - - private String getCallerClassName(int callStackDepth) { - return sun.reflect.Reflection.getCallerClass(callStackDepth).getName(); - } - */ + @Override + public boolean add(E e, Collection taglst) { + if (!tags.containsKey(e)) tags.put(e, new HashSet()); + tags.get(e).addAll(taglst); + + return super.add(e); + } + + @Override + public Set getTags(E e) { + Set ret = tags.get(e); + if (ret == null && this.contains(e)) { + tags.put(e, new HashSet()); + ret = tags.get(e); + } + return ret; + } + + @Override + public Set getTags(int index) { + return this.getTags(this.get(index)); + } + + @Override + public void addTag(E e, T tag) { + if (this.contains(e) && !tags.containsKey(e)) tags.put(e, new HashSet()); + + tags.get(e).add(tag); + } + + @Override + public void addTag(int index, T tag) { + this.addTag(this.get(index), tag); + } + + @Override + public void removeTag(E e, T tag) { + if (this.contains(e) && !tags.containsKey(e)) tags.put(e, new HashSet()); + + tags.get(e).remove(tag); + } + + @Override + public void removeTag(int index, T tag) { + this.removeTag(this.get(index), tag); + } + + @Override + public Set getEntries(T tag) { + Set ret = new HashSet(); + for (Entry> s : tags.entrySet()) { + if (s.getValue().contains(tag)) ret.add(s.getKey()); + } + return ret; + } + + @Override + public void removeEntries(T tag) { + for (E e : this.getEntries(tag)) this.remove(e); + } + + @Override + public String getTagsAsString(E e) { + String ret = ""; + for (T s : tags.get(e)) ret += s.toString() + ","; + + if (ret.length() > 0) ret = ret.substring(0, ret.length() - 1); + + return ret; + } + + @Override + public void clear() { + tags.clear(); + super.clear(); + } + + @Override + public E set(int index, E element) { + tags.remove(this.get(index)); + return super.set(index, element); + } + + @Override + public E remove(int index) { + tags.remove(this.get(index)); + return super.remove(index); + } + + @Override + public boolean remove(Object o) { + tags.remove(o); + return super.remove(o); + } + + @Override + public boolean removeAll(Collection c) { + for (Object o : c) tags.remove(o); + + return super.removeAll(c); + } + + @Override + protected void removeRange(int fromIndex, int toIndex) { + for (int i = fromIndex; i < toIndex; i++) tags.remove(this.get(i)); + + super.removeRange(fromIndex, toIndex); + } + + @Override + public boolean retainAll(Collection c) { + for (E e : tags.keySet()) if (!c.contains(e)) tags.remove(e); + + return super.retainAll(c); + } + + /* + * public boolean add(E e){ this.setInitialTag(e); return super.add(e); } public void add(int index, E element){ + * this.setInitialTag(element); super.add(index, element); } public boolean addAll(Collection c){ if (c + * instanceof TipList){ for (E e : c) tags.put(e, ((TipList)c).getTags(e)); } else { for (E e : c) + * this.setInitialTag(e); } return super.addAll(c); } public boolean addAll(int index, Collection c){ + * if (c instanceof TipList){ for (E e : c) tags.put(e, ((TipList)c).getTags(e)); } else { for (E e : c) + * this.setInitialTag(e); } return super.addAll(index, c); } public void clear(){ tags.clear(); super.clear(); } + * public Object clone(){ return super.clone(); } private void setInitialTag(E key){ tags.put(key, new ArrayList()); + * } private String getCallerClassName(int callStackDepth) { return + * sun.reflect.Reflection.getCallerClass(callStackDepth).getName(); } + */ } diff --git a/src/main/java/mcp/mobius/waila/api/package-info.java b/src/main/java/mcp/mobius/waila/api/package-info.java index 5fc5aa6..ee32c9d 100644 --- a/src/main/java/mcp/mobius/waila/api/package-info.java +++ b/src/main/java/mcp/mobius/waila/api/package-info.java @@ -1,3 +1,4 @@ -@API(apiVersion="1.2",owner="Waila",provides="WailaAPI") +@API(apiVersion = "1.2", owner = "Waila", provides = "WailaAPI") package mcp.mobius.waila.api; -import cpw.mods.fml.common.API; \ No newline at end of file + +import cpw.mods.fml.common.API; diff --git a/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java b/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java index b9d02f0..3dacafd 100644 --- a/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java +++ b/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java @@ -7,11 +7,12 @@ 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.client.resources.Language; 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; @@ -19,92 +20,71 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Easy localisation access. */ -public class LangUtil -{ +public class LangUtil { + public static LangUtil instance = new LangUtil(null); - + public String prefix; - - public LangUtil(String prefix) - { + + public LangUtil(String prefix) { this.prefix = prefix; } - - public static String translateG(String s, Object... format) - { + + 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; + + 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); + 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 - { + public void addLangFile(InputStream resource, String lang) throws IOException { LanguageRegistry reg = LanguageRegistry.instance(); BufferedReader reader = new BufferedReader(new InputStreamReader(resource, "UTF-8")); - while(true) - { + while (true) { String read = reader.readLine(); - if(read == null) - break; + if (read == null) break; int equalIndex = read.indexOf('='); - if(equalIndex == -1) - continue; + if (equalIndex == -1) continue; String key = read.substring(0, equalIndex); - String value = read.substring(equalIndex+1); - if(prefix != null) - key = prefix+"."+key; + 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) - { + public static LangUtil loadLangDir(String domain) { return new LangUtil(domain).addLangDir(new ResourceLocation(domain, "lang")); } - + @SideOnly(Side.CLIENT) - public LangUtil addLangDir(ResourceLocation dir) - { + public LangUtil addLangDir(ResourceLocation dir) { IResourceManager resManager = Minecraft.getMinecraft().getResourceManager(); - for(Language lang : (SortedSet)Minecraft.getMinecraft().getLanguageManager().getLanguages()) - { + for (Language lang : (SortedSet) 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) - { + try { + langRes = resManager.getResource( + new ResourceLocation(dir.getResourceDomain(), dir.getResourcePath() + '/' + langID + ".lang")); + } catch (Exception e) { continue; } - try - { + try { addLangFile(langRes.getInputStream(), langID); - } - catch(IOException e) - { - System.err.println("Failed to load lang resource. domain="+prefix+", resource="+langRes); + } catch (IOException e) { + System.err.println("Failed to load lang resource. domain=" + prefix + ", resource=" + langRes); e.printStackTrace(); } } - + return this; } } diff --git a/src/main/java/mcp/mobius/waila/cbcore/Layout.java b/src/main/java/mcp/mobius/waila/cbcore/Layout.java index c56d9b0..2eb7eee 100644 --- a/src/main/java/mcp/mobius/waila/cbcore/Layout.java +++ b/src/main/java/mcp/mobius/waila/cbcore/Layout.java @@ -1,6 +1,7 @@ package mcp.mobius.waila.cbcore; -public enum Layout -{ - HEADER, BODY, FOOTER +public enum Layout { + HEADER, + BODY, + FOOTER } diff --git a/src/main/java/mcp/mobius/waila/client/KeyEvent.java b/src/main/java/mcp/mobius/waila/client/KeyEvent.java index 6ebed64..a3480da 100644 --- a/src/main/java/mcp/mobius/waila/client/KeyEvent.java +++ b/src/main/java/mcp/mobius/waila/client/KeyEvent.java @@ -1,63 +1,80 @@ package mcp.mobius.waila.client; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.gui.screens.config.ScreenConfig; +import mcp.mobius.waila.utils.Constants; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.settings.KeyBinding; +import net.minecraftforge.common.config.Configuration; + +import org.lwjgl.input.Keyboard; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.gui.screens.config.ScreenConfig; -import mcp.mobius.waila.utils.Constants; -import net.minecraft.client.Minecraft; -import net.minecraft.client.settings.KeyBinding; -import net.minecraftforge.common.config.Configuration; -import org.lwjgl.input.Keyboard; public class KeyEvent { - public static KeyBinding key_cfg; - public static KeyBinding key_show; - public static KeyBinding key_liquid; - public static KeyBinding key_recipe; - public static KeyBinding key_usage; + public static KeyBinding key_cfg; + public static KeyBinding key_show; + public static KeyBinding key_liquid; + public static KeyBinding key_recipe; + public static KeyBinding key_usage; - public KeyEvent() { - ClientRegistry.registerKeyBinding(key_cfg = new KeyBinding(Constants.BIND_WAILA_CFG, Keyboard.KEY_NUMPAD0, "Waila")); - ClientRegistry.registerKeyBinding(key_show = new KeyBinding(Constants.BIND_WAILA_SHOW, Keyboard.KEY_NUMPAD1, "Waila")); - ClientRegistry.registerKeyBinding(key_liquid = new KeyBinding(Constants.BIND_WAILA_LIQUID, Keyboard.KEY_NUMPAD2, "Waila")); - ClientRegistry.registerKeyBinding(key_recipe = new KeyBinding(Constants.BIND_WAILA_RECIPE, Keyboard.KEY_NUMPAD3, "Waila")); - ClientRegistry.registerKeyBinding(key_usage = new KeyBinding(Constants.BIND_WAILA_USAGE, Keyboard.KEY_NUMPAD4, "Waila")); - } + public KeyEvent() { + ClientRegistry + .registerKeyBinding(key_cfg = new KeyBinding(Constants.BIND_WAILA_CFG, Keyboard.KEY_NUMPAD0, "Waila")); + ClientRegistry.registerKeyBinding( + key_show = new KeyBinding(Constants.BIND_WAILA_SHOW, Keyboard.KEY_NUMPAD1, "Waila")); + ClientRegistry.registerKeyBinding( + key_liquid = new KeyBinding(Constants.BIND_WAILA_LIQUID, Keyboard.KEY_NUMPAD2, "Waila")); + ClientRegistry.registerKeyBinding( + key_recipe = new KeyBinding(Constants.BIND_WAILA_RECIPE, Keyboard.KEY_NUMPAD3, "Waila")); + ClientRegistry.registerKeyBinding( + key_usage = new KeyBinding(Constants.BIND_WAILA_USAGE, Keyboard.KEY_NUMPAD4, "Waila")); + } - @SubscribeEvent - public void onKeyEvent(KeyInputEvent event) { - if (key_cfg.isPressed()) { - Minecraft mc = Minecraft.getMinecraft(); - if (mc.currentScreen == null) { - mc.displayGuiScreen(new ScreenConfig(null)); - } - } else if (key_show.isPressed() && ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)) { - 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 (key_show.isPressed() && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)) { - ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true); - } else if (key_liquid.isPressed()) { - 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 (key_recipe.isPressed()) { - if (Loader.isModLoaded("NotEnoughItems")) { - try { - Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("openRecipeGUI", boolean.class).invoke(null, true); - } catch (Exception ignored) { - } - } - } else if (key_usage.isPressed()) { - if (Loader.isModLoaded("NotEnoughItems")) { - try { - Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("openRecipeGUI", boolean.class).invoke(null, false); - } catch (Exception ignored) { - } - } - } - } + @SubscribeEvent + public void onKeyEvent(KeyInputEvent event) { + if (key_cfg.isPressed()) { + Minecraft mc = Minecraft.getMinecraft(); + if (mc.currentScreen == null) { + mc.displayGuiScreen(new ScreenConfig(null)); + } + } else if (key_show.isPressed() && ConfigHandler.instance() + .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)) { + 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 (key_show.isPressed() && !ConfigHandler.instance() + .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)) { + ConfigHandler.instance() + .setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true); + } else + if (key_liquid.isPressed()) { + 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 (key_recipe.isPressed()) { + if (Loader.isModLoaded("NotEnoughItems")) { + try { + Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler") + .getDeclaredMethod("openRecipeGUI", boolean.class).invoke(null, true); + } catch (Exception ignored) {} + } + } else if (key_usage.isPressed()) { + if (Loader.isModLoaded("NotEnoughItems")) { + try { + Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler") + .getDeclaredMethod("openRecipeGUI", boolean.class).invoke(null, false); + } catch (Exception ignored) {} + } + } + } } diff --git a/src/main/java/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java index 118e81b..9cbc793 100644 --- a/src/main/java/mcp/mobius/waila/client/ProxyClient.java +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.client; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.gui.truetyper.FontLoader; import mcp.mobius.waila.gui.truetyper.TrueTypeFont; import mcp.mobius.waila.handlers.HUDHandlerBlocks; @@ -10,64 +11,64 @@ import mcp.mobius.waila.handlers.VanillaTooltipHandler; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderHealth; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderProgressBar; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderStack; -//import mcp.mobius.waila.handlers.SummaryProviderDefault; import mcp.mobius.waila.server.ProxyServer; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.FMLCommonHandler; + import cpw.mods.fml.common.Loader; -import mcp.mobius.waila.cbcore.LangUtil; public class ProxyClient extends ProxyServer { - TrueTypeFont minecraftiaFont; - - //public static LangUtil lang = LangUtil.loadLangDir("waila"); - - public ProxyClient() {} - - - @Override - public void registerHandlers(){ - - LangUtil.loadLangDir("waila"); - - minecraftiaFont = FontLoader.createFont(new ResourceLocation("waila", "fonts/Minecraftia.ttf"), 14, true); - - //TickRegistry.registerTickHandler(WailaTickHandler.instance(), Side.CLIENT); - - if (Loader.isModLoaded("NotEnoughItems")){ - try{ - Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("register").invoke(null); - } catch (Exception e){ - Waila.log.error("Failed to hook into NEI properly. Reverting to Vanilla tooltip handler"); - MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler()); - } - } else { - MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler()); - } + TrueTypeFont minecraftiaFont; - 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().registerShortDataProvider(new SummaryProviderDefault(), Item.class); + // public static LangUtil lang = LangUtil.loadLangDir("waila"); - ModuleRegistrar.instance().addConfig("General", "general.showents"); - ModuleRegistrar.instance().addConfig("General", "general.showhp"); - ModuleRegistrar.instance().addConfig("General", "general.showcrop"); - - ModuleRegistrar.instance().registerTooltipRenderer("waila.health", new TTRenderHealth()); - ModuleRegistrar.instance().registerTooltipRenderer("waila.stack", new TTRenderStack()); - ModuleRegistrar.instance().registerTooltipRenderer("waila.progress", new TTRenderProgressBar()); - } - - @Override - public Object getFont(){return this.minecraftiaFont;} + public ProxyClient() {} + + @Override + public void registerHandlers() { + + LangUtil.loadLangDir("waila"); + + minecraftiaFont = FontLoader.createFont(new ResourceLocation("waila", "fonts/Minecraftia.ttf"), 14, true); + + // TickRegistry.registerTickHandler(WailaTickHandler.instance(), Side.CLIENT); + + if (Loader.isModLoaded("NotEnoughItems")) { + try { + Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("register").invoke(null); + } catch (Exception e) { + Waila.log.error("Failed to hook into NEI properly. Reverting to Vanilla tooltip handler"); + MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler()); + } + } else { + MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler()); + } + + 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().registerShortDataProvider(new SummaryProviderDefault(), Item.class); + + ModuleRegistrar.instance().addConfig("General", "general.showents"); + ModuleRegistrar.instance().addConfig("General", "general.showhp"); + ModuleRegistrar.instance().addConfig("General", "general.showcrop"); + + ModuleRegistrar.instance().registerTooltipRenderer("waila.health", new TTRenderHealth()); + ModuleRegistrar.instance().registerTooltipRenderer("waila.stack", new TTRenderStack()); + ModuleRegistrar.instance().registerTooltipRenderer("waila.progress", new TTRenderProgressBar()); + } + + @Override + public Object getFont() { + return this.minecraftiaFont; + } } diff --git a/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java b/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java index aaa40d4..e5dca1e 100644 --- a/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java +++ b/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java @@ -3,105 +3,109 @@ package mcp.mobius.waila.commands; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaEntityProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; + import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; public class CommandDumpHandlers extends CommandBase { - @Override - public String getCommandName() { - return "dumphandlers"; - } + @Override + public String getCommandName() { + return "dumphandlers"; + } - @Override - public String getCommandUsage(ICommandSender p_71518_1_) { - return "/dumphandlers"; - } + @Override + public String getCommandUsage(ICommandSender p_71518_1_) { + return "/dumphandlers"; + } - @Override - public void processCommand(ICommandSender p_71515_1_, String[] p_71515_2_) { - - System.out.printf("\n\n== HEAD BLOCK PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().headBlockProviders.keySet()){ - System.out.printf("+ %s +\n", clazz.getName()); - for (IWailaDataProvider provider : ModuleRegistrar.instance().headBlockProviders.get(clazz)){ - System.out.printf(" - %s\n", provider.getClass().getName()); - } - System.out.printf("\n"); - } + @Override + public void processCommand(ICommandSender p_71515_1_, String[] p_71515_2_) { - System.out.printf("\n\n== BODY BLOCK PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().bodyBlockProviders.keySet()){ - System.out.printf("+ %s +\n", clazz.getName()); - for (IWailaDataProvider provider : ModuleRegistrar.instance().bodyBlockProviders.get(clazz)){ - System.out.printf(" - %s\n", provider.getClass().getName()); - } - System.out.printf("\n"); - } - - System.out.printf("\n\n== TAIL BLOCK PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().tailBlockProviders.keySet()){ - System.out.printf("+ %s +\n", clazz.getName()); - for (IWailaDataProvider provider : ModuleRegistrar.instance().tailBlockProviders.get(clazz)){ - System.out.printf(" - %s\n", provider.getClass().getName()); - } - System.out.printf("\n"); - } - - System.out.printf("\n\n== STACK BLOCK PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().stackBlockProviders.keySet()){ - System.out.printf("+ %s +\n", clazz.getName()); - for (IWailaDataProvider provider : ModuleRegistrar.instance().stackBlockProviders.get(clazz)){ - System.out.printf(" - %s\n", provider.getClass().getName()); - } - System.out.printf("\n"); - } + System.out.printf("\n\n== HEAD BLOCK PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().headBlockProviders.keySet()) { + System.out.printf("+ %s +\n", clazz.getName()); + for (IWailaDataProvider provider : ModuleRegistrar.instance().headBlockProviders.get(clazz)) { + System.out.printf(" - %s\n", provider.getClass().getName()); + } + System.out.printf("\n"); + } - System.out.printf("\n\n== HEAD ENTITY PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().headEntityProviders.keySet()){ - System.out.printf("+ %s +\n", clazz.getName()); - for (IWailaEntityProvider provider : ModuleRegistrar.instance().headEntityProviders.get(clazz)){ - System.out.printf(" - %s\n", provider.getClass().getName()); - } - System.out.printf("\n"); - } + System.out.printf("\n\n== BODY BLOCK PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().bodyBlockProviders.keySet()) { + System.out.printf("+ %s +\n", clazz.getName()); + for (IWailaDataProvider provider : ModuleRegistrar.instance().bodyBlockProviders.get(clazz)) { + System.out.printf(" - %s\n", provider.getClass().getName()); + } + System.out.printf("\n"); + } - System.out.printf("\n\n== BODY ENTITY PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().bodyEntityProviders.keySet()){ - System.out.printf("+ %s +\n", clazz.getName()); - for (IWailaEntityProvider provider : ModuleRegistrar.instance().bodyEntityProviders.get(clazz)){ - System.out.printf(" - %s\n", provider.getClass().getName()); - } - System.out.printf("\n"); - } - - System.out.printf("\n\n== TAIL ENTITY PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().tailEntityProviders.keySet()){ - System.out.printf("+ %s +\n", clazz.getName()); - for (IWailaEntityProvider provider : ModuleRegistrar.instance().tailEntityProviders.get(clazz)){ - System.out.printf(" - %s\n", provider.getClass().getName()); - } - System.out.printf("\n"); - } - - System.out.printf("\n\n== STACK ENTITY PROVIDERS ==\n"); - for (Class clazz : ModuleRegistrar.instance().overrideEntityProviders.keySet()){ - System.out.printf("+ %s +\n", clazz.getName()); - for (IWailaEntityProvider provider : ModuleRegistrar.instance().overrideEntityProviders.get(clazz)){ - System.out.printf(" - %s\n", provider.getClass().getName()); - } - System.out.printf("\n"); - } + System.out.printf("\n\n== TAIL BLOCK PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().tailBlockProviders.keySet()) { + System.out.printf("+ %s +\n", clazz.getName()); + for (IWailaDataProvider provider : ModuleRegistrar.instance().tailBlockProviders.get(clazz)) { + System.out.printf(" - %s\n", provider.getClass().getName()); + } + System.out.printf("\n"); + } - } + System.out.printf("\n\n== STACK BLOCK PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().stackBlockProviders.keySet()) { + System.out.printf("+ %s +\n", clazz.getName()); + for (IWailaDataProvider provider : ModuleRegistrar.instance().stackBlockProviders.get(clazz)) { + System.out.printf(" - %s\n", provider.getClass().getName()); + } + System.out.printf("\n"); + } - @Override - public int getRequiredPermissionLevel(){ return 3; } + System.out.printf("\n\n== HEAD ENTITY PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().headEntityProviders.keySet()) { + System.out.printf("+ %s +\n", clazz.getName()); + for (IWailaEntityProvider provider : ModuleRegistrar.instance().headEntityProviders.get(clazz)) { + System.out.printf(" - %s\n", provider.getClass().getName()); + } + System.out.printf("\n"); + } + + System.out.printf("\n\n== BODY ENTITY PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().bodyEntityProviders.keySet()) { + System.out.printf("+ %s +\n", clazz.getName()); + for (IWailaEntityProvider provider : ModuleRegistrar.instance().bodyEntityProviders.get(clazz)) { + System.out.printf(" - %s\n", provider.getClass().getName()); + } + System.out.printf("\n"); + } + + System.out.printf("\n\n== TAIL ENTITY PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().tailEntityProviders.keySet()) { + System.out.printf("+ %s +\n", clazz.getName()); + for (IWailaEntityProvider provider : ModuleRegistrar.instance().tailEntityProviders.get(clazz)) { + System.out.printf(" - %s\n", provider.getClass().getName()); + } + System.out.printf("\n"); + } + + System.out.printf("\n\n== STACK ENTITY PROVIDERS ==\n"); + for (Class clazz : ModuleRegistrar.instance().overrideEntityProviders.keySet()) { + System.out.printf("+ %s +\n", clazz.getName()); + for (IWailaEntityProvider provider : ModuleRegistrar.instance().overrideEntityProviders.get(clazz)) { + System.out.printf(" - %s\n", provider.getClass().getName()); + } + System.out.printf("\n"); + } + + } + + @Override + public int getRequiredPermissionLevel() { + return 3; + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + // if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager + // instanceof MemoryConnection) return true; + return super.canCommandSenderUseCommand(sender); + } - @Override - public boolean canCommandSenderUseCommand(ICommandSender sender){ - //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; - return super.canCommandSenderUseCommand(sender); - } - } diff --git a/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java index 2aee08f..d7312ec 100644 --- a/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java +++ b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java @@ -1,101 +1,103 @@ package mcp.mobius.waila.gui.events; +import mcp.mobius.waila.gui.interfaces.IWidget; + import net.minecraft.client.Minecraft; import org.lwjgl.input.Mouse; -import mcp.mobius.waila.gui.interfaces.IWidget; - public class MouseEvent { - public enum EventType {NONE, MOVE, CLICK, RELEASED, DRAG, WHEEL, ENTER, LEAVE}; - - public long timestamp; - public Minecraft mc; - public IWidget srcwidget; - public IWidget trgwidget; - public double x,y; - public int z; - public static int buttonCount = Mouse.getButtonCount(); - public boolean[] buttonState = new boolean[buttonCount]; - public EventType type; - public int button = -1; - - - public MouseEvent(IWidget widget){ - this.srcwidget = widget; - this.timestamp = System.nanoTime(); - - this.mc = Minecraft.getMinecraft(); - - this.x = (double)Mouse.getEventX() * (double)this.srcwidget.getSize().getX() / (double)this.mc.displayWidth; - this.y = (double)this.srcwidget.getSize().getY() - (double)Mouse.getEventY() * (double)this.srcwidget.getSize().getY() / (double)this.mc.displayHeight - 1.0; - - //this.x = Mouse.getEventX(); - //this.y = Mouse.getEventY(); - - //System.out.printf("%s %s\n", this.x, this.y); - - //this.z = Mouse.getEventDWheel(); + public enum EventType { + NONE, + MOVE, + CLICK, + RELEASED, + DRAG, + WHEEL, + ENTER, + LEAVE + }; + + public long timestamp; + public Minecraft mc; + public IWidget srcwidget; + public IWidget trgwidget; + public double x, y; + public int z; + public static int buttonCount = Mouse.getButtonCount(); + public boolean[] buttonState = new boolean[buttonCount]; + public EventType type; + public int button = -1; + + public MouseEvent(IWidget widget) { + this.srcwidget = widget; + this.timestamp = System.nanoTime(); + + this.mc = Minecraft.getMinecraft(); + + this.x = (double) Mouse.getEventX() * (double) this.srcwidget.getSize().getX() / (double) this.mc.displayWidth; + this.y = (double) this.srcwidget.getSize().getY() + - (double) Mouse.getEventY() * (double) this.srcwidget.getSize().getY() / (double) this.mc.displayHeight + - 1.0; + + // this.x = Mouse.getEventX(); + // this.y = Mouse.getEventY(); + + // System.out.printf("%s %s\n", this.x, this.y); + + // this.z = Mouse.getEventDWheel(); this.z = Mouse.getDWheel(); - - for (int i = 0; i < buttonCount; i++) - buttonState[i] = Mouse.isButtonDown(i); - + + for (int i = 0; i < buttonCount; i++) buttonState[i] = Mouse.isButtonDown(i); + this.trgwidget = this.srcwidget.getWidgetAtCoordinates(this.x, this.y); - } - - public String toString(){ - String retstring = String.format("MOUSE %s : [%s] [ %.2f %.2f %d ] [", this.type, this.timestamp, this.x, this.y, this.z); - if (this.buttonCount < 5) - for (int i = 0; i < this.buttonCount; i++) - retstring += String.format(" %s ", this.buttonState[i]); - else - for (int i = 0; i < 5; i++) - retstring += String.format(" %s ", this.buttonState[i]); - retstring += "]"; - - if (this.button != -1) - retstring += String.format(" Button %s", this.button); - - return retstring; - } - - // Returns the event type based on the previous mouse event. - public EventType getEventType(MouseEvent me){ - - this.type = EventType.NONE; - - if (this.trgwidget != me.trgwidget){ - this.type = EventType.ENTER; - return this.type; - } - - if (this.z != 0){ - this.type = EventType.WHEEL; - return this.type; - } - - for (int i = 0; i < this.buttonCount; i++){ - if (this.buttonState[i] != me.buttonState[i]){ - if (this.buttonState[i] == true) - this.type = EventType.CLICK; - else - this.type = EventType.RELEASED; - this.button = i; - return this.type; - } - } - - //MOVE & DRAG EVENTS (we moved the mouse and button 0 was clicked or not) - if ((this.x != me.x) || (this.y != me.y)){ - if (this.buttonState[0] == true) - this.type = EventType.DRAG; - else - this.type = EventType.MOVE; - return this.type; - } - - return this.type; - } + } + + public String toString() { + String retstring = String + .format("MOUSE %s : [%s] [ %.2f %.2f %d ] [", this.type, this.timestamp, this.x, this.y, this.z); + if (this.buttonCount < 5) + for (int i = 0; i < this.buttonCount; i++) retstring += String.format(" %s ", this.buttonState[i]); + else for (int i = 0; i < 5; i++) retstring += String.format(" %s ", this.buttonState[i]); + retstring += "]"; + + if (this.button != -1) retstring += String.format(" Button %s", this.button); + + return retstring; + } + + // Returns the event type based on the previous mouse event. + public EventType getEventType(MouseEvent me) { + + this.type = EventType.NONE; + + if (this.trgwidget != me.trgwidget) { + this.type = EventType.ENTER; + return this.type; + } + + if (this.z != 0) { + this.type = EventType.WHEEL; + return this.type; + } + + for (int i = 0; i < this.buttonCount; i++) { + if (this.buttonState[i] != me.buttonState[i]) { + if (this.buttonState[i] == true) this.type = EventType.CLICK; + else this.type = EventType.RELEASED; + this.button = i; + return this.type; + } + } + + // MOVE & DRAG EVENTS (we moved the mouse and button 0 was clicked or not) + if ((this.x != me.x) || (this.y != me.y)) { + if (this.buttonState[0] == true) this.type = EventType.DRAG; + else this.type = EventType.MOVE; + return this.type; + } + + return this.type; + } } diff --git a/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java b/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java index b648120..85a02e1 100644 --- a/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java +++ b/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java @@ -9,12 +9,12 @@ import com.google.common.collect.Lists; public class ReverseIterator implements Iterable { - private ListIterator listIterator; + private ListIterator listIterator; public ReverseIterator(Collection wrappedList) { - List list = Lists.newArrayList(wrappedList); - this.listIterator = list.listIterator(wrappedList.size()); - } + List list = Lists.newArrayList(wrappedList); + this.listIterator = list.listIterator(wrappedList.size()); + } public Iterator iterator() { return new Iterator() { @@ -32,6 +32,6 @@ public class ReverseIterator implements Iterable { } }; - } - + } + } diff --git a/src/main/java/mcp/mobius/waila/gui/helpers/UIException.java b/src/main/java/mcp/mobius/waila/gui/helpers/UIException.java index 80c10bb..ea12ac1 100644 --- a/src/main/java/mcp/mobius/waila/gui/helpers/UIException.java +++ b/src/main/java/mcp/mobius/waila/gui/helpers/UIException.java @@ -1,6 +1,7 @@ package mcp.mobius.waila.gui.helpers; public class UIException extends RuntimeException { + public UIException(String message) { super(message); } diff --git a/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java b/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java index 7feeea4..900c6d4 100644 --- a/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java +++ b/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java @@ -1,44 +1,57 @@ package mcp.mobius.waila.gui.helpers; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.Vec3; +import org.lwjgl.opengl.GL11; + public class UIHelper { - - public static void drawTexture(int posX, int posY, int sizeX, int sizeY) - { - UIHelper.drawTexture(posX, posY, sizeX, sizeY, 0, 0, 256, 256); - } - - public static void drawTexture(int posX, int posY, int sizeX, int sizeY, int texU, int texV, int texSizeU, int texSizeV) - { + + public static void drawTexture(int posX, int posY, int sizeX, int sizeY) { + UIHelper.drawTexture(posX, posY, sizeX, sizeY, 0, 0, 256, 256); + } + + public static void drawTexture(int posX, int posY, int sizeX, int sizeY, int texU, int texV, int texSizeU, + int texSizeV) { float zLevel = 0.0F; float f = 0.00390625F; - + Tessellator tess = Tessellator.instance; tess.startDrawingQuads(); - tess.addVertexWithUV((double)(posX + 0), (double)(posY + sizeY), (double)zLevel, texU*f, (texV + texSizeV)*f); - tess.addVertexWithUV((double)(posX + sizeX), (double)(posY + sizeY), (double)zLevel, (texU + texSizeU)*f, (texV + texSizeV)*f); - tess.addVertexWithUV((double)(posX + sizeX), (double)(posY + 0), (double)zLevel, (texU + texSizeU)*f, texV*f); - tess.addVertexWithUV((double)(posX + 0), (double)(posY + 0), (double)zLevel, texU*f, texV*f); + tess.addVertexWithUV( + (double) (posX + 0), + (double) (posY + sizeY), + (double) zLevel, + texU * f, + (texV + texSizeV) * f); + tess.addVertexWithUV( + (double) (posX + sizeX), + (double) (posY + sizeY), + (double) zLevel, + (texU + texSizeU) * f, + (texV + texSizeV) * f); + tess.addVertexWithUV( + (double) (posX + sizeX), + (double) (posY + 0), + (double) zLevel, + (texU + texSizeU) * f, + texV * f); + tess.addVertexWithUV((double) (posX + 0), (double) (posY + 0), (double) zLevel, texU * f, texV * f); tess.draw(); - } - - public static void drawGradientRect(int minx, int miny, int maxx, int maxy, int zlevel, int color1, int color2) - { - float alpha1 = (float)(color1 >> 24 & 255) / 255.0F; - float red1 = (float)(color1 >> 16 & 255) / 255.0F; - float green1 = (float)(color1 >> 8 & 255) / 255.0F; - float blue1 = (float)(color1 & 255) / 255.0F; - float alpha2 = (float)(color2 >> 24 & 255) / 255.0F; - float red2 = (float)(color2 >> 16 & 255) / 255.0F; - float green2 = (float)(color2 >> 8 & 255) / 255.0F; - float blue2 = (float)(color2 & 255) / 255.0F; + } + + public static void drawGradientRect(int minx, int miny, int maxx, int maxy, int zlevel, int color1, int color2) { + float alpha1 = (float) (color1 >> 24 & 255) / 255.0F; + float red1 = (float) (color1 >> 16 & 255) / 255.0F; + float green1 = (float) (color1 >> 8 & 255) / 255.0F; + float blue1 = (float) (color1 & 255) / 255.0F; + float alpha2 = (float) (color2 >> 24 & 255) / 255.0F; + float red2 = (float) (color2 >> 16 & 255) / 255.0F; + float green2 = (float) (color2 >> 8 & 255) / 255.0F; + float blue2 = (float) (color2 & 255) / 255.0F; GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_ALPHA_TEST); @@ -47,94 +60,153 @@ public class UIHelper { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setColorRGBA_F(red1, green1, blue1, alpha1); - tessellator.addVertex((double)maxx, (double)miny, (double)zlevel); - tessellator.addVertex((double)minx, (double)miny, (double)zlevel); + tessellator.addVertex((double) maxx, (double) miny, (double) zlevel); + tessellator.addVertex((double) minx, (double) miny, (double) zlevel); tessellator.setColorRGBA_F(red2, green2, blue2, alpha2); - tessellator.addVertex((double)minx, (double)maxy, (double)zlevel); - tessellator.addVertex((double)maxx, (double)maxy, (double)zlevel); + tessellator.addVertex((double) minx, (double) maxy, (double) zlevel); + tessellator.addVertex((double) maxx, (double) maxy, (double) zlevel); tessellator.draw(); GL11.glShadeModel(GL11.GL_FLAT); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); 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){ + + 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 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.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); + // GL11.glDisable(GL11.GL_TEXTURE_2D); drawRectangle(x1, y1, 0, x2, y2, 0, r, g, b, a); - GL11.glPopMatrix(); + 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); + + 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); } - - public static void drawBillboardText(String text, float posX, float posY, float posZ, float offX, float offY, float offZ, double partialFrame){ + + public static void drawBillboardText(String text, float posX, float posY, float posZ, float offX, float offY, + float offZ, 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; - + float playerViewY = player.prevRotationYaw + + (player.rotationYaw - player.prevRotationYaw) * (float) partialFrame; + float playerViewX = player.prevRotationPitch + + (player.rotationPitch - player.prevRotationPitch) * (float) partialFrame; + UIHelper.drawFloatingText(text, posX, posY, posZ, offX, offY, offZ, playerViewX, playerViewY * -1.0F, 0.0F); } - public static void drawFloatingText(String text, Vec3 pos, float offX, float offY, float offZ, float rotX, float rotY, float rotZ){ - UIHelper.drawFloatingText(text, (float)pos.xCoord, (float)pos.yCoord, (float)pos.zCoord, offX, offY, offZ, rotX, rotY, rotZ); + public static void drawFloatingText(String text, Vec3 pos, float offX, float offY, float offZ, float rotX, + float rotY, float rotZ) { + UIHelper.drawFloatingText( + text, + (float) pos.xCoord, + (float) pos.yCoord, + (float) pos.zCoord, + offX, + offY, + offZ, + rotX, + rotY, + rotZ); } - - public static void drawFloatingText(String text, float posX, float posY, float posZ, float offX, float offY, float offZ, float rotX, float rotY, float rotZ){ - - if (text.isEmpty()) return; - - FontRenderer fontrenderer = Minecraft.getMinecraft().fontRenderer; - + + public static void drawFloatingText(String text, float posX, float posY, float posZ, float offX, float offY, + float offZ, float rotX, float rotY, float rotZ) { + + if (text.isEmpty()) return; + + FontRenderer fontrenderer = Minecraft.getMinecraft().fontRenderer; + float f = 1.6F; float f1 = 0.016666668F * f; GL11.glPushMatrix(); - - //GL11.glTranslatef((float)accessor.getPosition().blockX + 0.0F, (float)accessor.getPosition().blockY + 0.5F, (float)accessor.getPosition().blockZ); + // GL11.glTranslatef((float)accessor.getPosition().blockX + 0.0F, (float)accessor.getPosition().blockY + 0.5F, + // (float)accessor.getPosition().blockZ); GL11.glTranslatef(posX + offX, posY + offY, posZ + offZ); - - //GL11.glTranslatef(posX, posY, posZ); + + // GL11.glTranslatef(posX, posY, posZ); 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.glTranslatef(offX, offY, offZ); - + GL11.glRotatef(rotZ, 0.0F, 0.0F, 1.0F); + // GL11.glTranslatef(offX, offY, offZ); + GL11.glScalef(-f1, -f1, f1); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); @@ -145,48 +217,60 @@ public class UIHelper { GL11.glDisable(GL11.GL_TEXTURE_2D); int j = fontrenderer.getStringWidth(text) / 2; - drawRectangle((double)(-j - 1), (double)(8 + b0), 0.0, (double)(j + 1), (double)(-1 + b0), 0.0, 0, 0, 0, 64); - + 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); GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glDepthMask(true); fontrenderer.drawString(text, -fontrenderer.getStringWidth(text) / 2, b0, -1); - //GL11.glEnable(GL11.GL_LIGHTING); - //GL11.glDisable(GL11.GL_BLEND); - //GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + // GL11.glEnable(GL11.GL_LIGHTING); + // GL11.glDisable(GL11.GL_BLEND); + // GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glPopMatrix(); - - } - - 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; - + GL11.glPopMatrix(); + + } + + 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.startDrawingQuads(); tessellator.setColorRGBA(r, g, b, a); - + tessellator.addVertex(x1, y2, z1); tessellator.addVertex(x1, y1, z2); tessellator.addVertex(x2, y1, z2); tessellator.addVertex(x2, y2, z1); tessellator.draw(); - + } - - 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; - + + 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.startDrawingQuads(); tessellator.setColorRGBA(r, g, b, a); - + tessellator.addVertex(x1, y1, z1); tessellator.addVertex(x1, y1, z2); tessellator.addVertex(x2, y2, z2); - tessellator.addVertex(x2, y2, z1); - - tessellator.draw(); - } - + tessellator.addVertex(x2, y2, z1); + + tessellator.draw(); + } + } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java b/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java index 4f5a929..e13ec92 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java @@ -1,8 +1,8 @@ package mcp.mobius.waila.gui.interfaces; public enum CType { -REL_X, -REL_Y, -RELXY, -ABSXY; + REL_X, + REL_Y, + RELXY, + ABSXY; } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java index 9c2183d..c2d115a 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java @@ -6,59 +6,87 @@ import mcp.mobius.waila.gui.widgets.WidgetGeometry; import org.lwjgl.util.Point; public interface IWidget { - // Should all the coordinates, sizes, etc be % or absolute values ? - // Should we allow 2 methods for an absolute referencing (screen pos) and relative one (parent pos) ? - - IWidget getParent(); - void setParent(IWidget parent); - - IWidget setGeometry(WidgetGeometry geom); - WidgetGeometry getGeometry(); + // Should all the coordinates, sizes, etc be % or absolute values ? + // Should we allow 2 methods for an absolute referencing (screen pos) and relative one (parent pos) ? + + IWidget getParent(); + + void setParent(IWidget parent); + + IWidget setGeometry(WidgetGeometry geom); + + WidgetGeometry getGeometry(); + + IWidget setPos(double x, double y); + + IWidget setPos(double x, double y, boolean fracX, boolean fracY); + + IWidget setSize(double sx, double sy); + + IWidget setSize(double sx, double sy, boolean fracX, boolean fracY); + + IWidget adjustSize(); + + Point getPos(); + + Point getSize(); + + int getRight(); + + int getLeft(); + + int getTop(); + + int getBottom(); + + void draw(); + + void draw(Point pos); + + void show(); + + void hide(); + + void setAlpha(float alpha); + + float getAlpha(); + + boolean shouldRender(); + + IWidget addWidget(String name, IWidget widget); + + IWidget addWidget(String name, IWidget widget, RenderPriority priority); + + IWidget getWidget(String name); + + IWidget delWidget(String name); + + IWidget getWidgetAtCoordinates(double posX, double posY); + + boolean isWidgetAtCoordinates(double posx, double posy); + + void handleMouseInput(); + + void onMouseClick(MouseEvent event); + + void onMouseDrag(MouseEvent event); + + void onMouseMove(MouseEvent event); + + void onMouseRelease(MouseEvent event); + + void onMouseWheel(MouseEvent event); + + void onMouseEnter(MouseEvent event); + + void onMouseLeave(MouseEvent event); + + void emit(Signal signal, Object... params); + + void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params); + + // boolean onMouseEnter(); + // boolean onMouseMoved(); + // boolean onMouseLeave(); - IWidget setPos(double x, double y); - IWidget setPos(double x, double y, boolean fracX, boolean fracY); - IWidget setSize(double sx, double sy); - IWidget setSize(double sx, double sy, boolean fracX, boolean fracY); - IWidget adjustSize(); - - Point getPos(); - Point getSize(); - int getRight(); - int getLeft(); - int getTop(); - int getBottom(); - - void draw(); - void draw(Point pos); - void show(); - void hide(); - void setAlpha(float alpha); - float getAlpha(); - boolean shouldRender(); - - IWidget addWidget(String name, IWidget widget); - IWidget addWidget(String name, IWidget widget, RenderPriority priority); - IWidget getWidget(String name); - IWidget delWidget(String name); - IWidget getWidgetAtCoordinates(double posX, double posY); - - boolean isWidgetAtCoordinates(double posx, double posy); - - void handleMouseInput(); - - void onMouseClick(MouseEvent event); - void onMouseDrag(MouseEvent event); - void onMouseMove(MouseEvent event); - void onMouseRelease(MouseEvent event); - void onMouseWheel(MouseEvent event); - void onMouseEnter(MouseEvent event); - void onMouseLeave(MouseEvent event); - - void emit(Signal signal, Object... params); - void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params); - - //boolean onMouseEnter(); - //boolean onMouseMoved(); - //boolean onMouseLeave(); - } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java b/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java index d41d9b0..7446865 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java @@ -1,7 +1,7 @@ package mcp.mobius.waila.gui.interfaces; public enum RenderPriority { - LOW, - MEDIUM, - HIGH; + LOW, + MEDIUM, + HIGH; } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java b/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java index beb87e7..5ec6881 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java @@ -1,8 +1,8 @@ package mcp.mobius.waila.gui.interfaces; public enum Signal { - DRAGGED, - CLICKED, - VALUE_CHANGED, - GEOM_CHANGED; + DRAGGED, + CLICKED, + VALUE_CHANGED, + GEOM_CHANGED; } diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java b/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java index d5e11f6..9e1380c 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java @@ -1,5 +1,9 @@ package mcp.mobius.waila.gui.interfaces; public enum WAlign { -LEFT,CENTER,RIGHT,TOP,BOTTOM; + LEFT, + CENTER, + RIGHT, + TOP, + BOTTOM; } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java index 8384a13..a29fb27 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java @@ -2,89 +2,87 @@ package mcp.mobius.waila.gui.screens; import java.util.HashMap; -import org.lwjgl.input.Mouse; - import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.widgets.LayoutCanvas; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -public abstract class ScreenBase extends GuiScreen{ - protected GuiScreen parent; // Return screen if available. - protected Minecraft mc; // Minecraft instance - protected HashMap widgets; // List of widgets on this ui - - public ScreenBase(GuiScreen parent) { - this.parent = parent; - this.mc = Minecraft.getMinecraft(); - this.widgets = new HashMap(); - - this.addWidget("canvas", new LayoutCanvas()); - - Mouse.getDWheel(); // We init the DWheel method (getDWheel returns the value since the last call, so we have to call it once on ui creation) - } - - ///////////////////// - // WIDGET HANDLING // - ///////////////////// - - public IWidget addWidget(String name, IWidget widget){ - this.widgets.put(name, widget); - return this.getWidget(name); - } - - public IWidget getWidget(String name){ - return this.widgets.get(name); - } - - public IWidget delWidget(String name){ - IWidget widget = this.getWidget(name); - this.widgets.remove(widget); - return widget; - } - - public IWidget getRoot(){ - return this.getWidget("canvas"); - } - - ///////////////////// - // DRAWING METHODS // - ///////////////////// - - @Override - public void drawScreen(int i, int j, float f) { - this.drawDefaultBackground(); //The dark background common to most of the UIs - super.drawScreen(i, j, f); - - for (IWidget widget: this.widgets.values()) - widget.draw(); - } +import org.lwjgl.input.Mouse; - // Used to easily display a UI without having to mess with mc handle. - public void display(){ - this.mc.displayGuiScreen(this); - } - - ///////////////////// - // INPUT METHODS // - ///////////////////// - - //Keyboard handling. Basic one is just returning to the previous UI when Esc is pressed - @Override - public void keyTyped(char keyChar, int keyID) - { - if (keyID == 1) - if (this.parent == null){ - this.mc.displayGuiScreen((GuiScreen)null); - this.mc.setIngameFocus(); - } else - this.mc.displayGuiScreen(this.parent); - } +public abstract class ScreenBase extends GuiScreen { - @Override - public void handleMouseInput() - { - this.getRoot().handleMouseInput(); - } + protected GuiScreen parent; // Return screen if available. + protected Minecraft mc; // Minecraft instance + protected HashMap widgets; // List of widgets on this ui + + public ScreenBase(GuiScreen parent) { + this.parent = parent; + this.mc = Minecraft.getMinecraft(); + this.widgets = new HashMap(); + + this.addWidget("canvas", new LayoutCanvas()); + + Mouse.getDWheel(); // We init the DWheel method (getDWheel returns the value since the last call, so we have to + // call it once on ui creation) + } + + ///////////////////// + // WIDGET HANDLING // + ///////////////////// + + public IWidget addWidget(String name, IWidget widget) { + this.widgets.put(name, widget); + return this.getWidget(name); + } + + public IWidget getWidget(String name) { + return this.widgets.get(name); + } + + public IWidget delWidget(String name) { + IWidget widget = this.getWidget(name); + this.widgets.remove(widget); + return widget; + } + + public IWidget getRoot() { + return this.getWidget("canvas"); + } + + ///////////////////// + // DRAWING METHODS // + ///////////////////// + + @Override + public void drawScreen(int i, int j, float f) { + this.drawDefaultBackground(); // The dark background common to most of the UIs + super.drawScreen(i, j, f); + + for (IWidget widget : this.widgets.values()) widget.draw(); + } + + // Used to easily display a UI without having to mess with mc handle. + public void display() { + this.mc.displayGuiScreen(this); + } + + ///////////////////// + // INPUT METHODS // + ///////////////////// + + // Keyboard handling. Basic one is just returning to the previous UI when Esc is pressed + @Override + public void keyTyped(char keyChar, int keyID) { + if (keyID == 1) if (this.parent == null) { + this.mc.displayGuiScreen((GuiScreen) null); + this.mc.setIngameFocus(); + } else this.mc.displayGuiScreen(this.parent); + } + + @Override + public void handleMouseInput() { + this.getRoot().handleMouseInput(); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java index 3c85cf3..0754cfa 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java @@ -5,28 +5,34 @@ import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -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 { - public ScreenConfig(GuiScreen parent){ - super(parent); - - this.getRoot().addWidget("ButtonContainer", new ButtonContainer(this.getRoot(), 2, 100, 25.0)); - this.getRoot().getWidget("ButtonContainer").setGeometry(new WidgetGeometry(50.0, 50.0, 50.0, 30.0, CType.RELXY, CType.REL_X, WAlign.CENTER, WAlign.CENTER)); - - ButtonContainer buttonContainer = ((ButtonContainer)this.getRoot().getWidget("ButtonContainer")); - - buttonContainer.addButton( new ButtonScreenChange(this.getRoot(), "screen.button.waila", new ScreenWailaConfig(this))); - buttonContainer.addButton( new ButtonScreenChange(this.getRoot(), "screen.button.modules", new ScreenModuleChoice(this))); - - this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); - this.getRoot().getWidget("LayoutBack").setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); - this.getRoot().getWidget("LayoutBack").addWidget("ButtonBack", new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "screen.button.back", this.parent)); - this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - } + + public ScreenConfig(GuiScreen parent) { + super(parent); + + this.getRoot().addWidget("ButtonContainer", new ButtonContainer(this.getRoot(), 2, 100, 25.0)); + this.getRoot().getWidget("ButtonContainer").setGeometry( + new WidgetGeometry(50.0, 50.0, 50.0, 30.0, CType.RELXY, CType.REL_X, WAlign.CENTER, WAlign.CENTER)); + + ButtonContainer buttonContainer = ((ButtonContainer) this.getRoot().getWidget("ButtonContainer")); + + buttonContainer + .addButton(new ButtonScreenChange(this.getRoot(), "screen.button.waila", new ScreenWailaConfig(this))); + buttonContainer.addButton( + new ButtonScreenChange(this.getRoot(), "screen.button.modules", new ScreenModuleChoice(this))); + + this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutBack") + .setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutBack").addWidget( + "ButtonBack", + new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "screen.button.back", this.parent)); + this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry( + new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java index 710d53c..ea761c4 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java @@ -1,8 +1,5 @@ package mcp.mobius.waila.gui.screens.config; -import org.lwjgl.util.Point; - -import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.interfaces.CType; @@ -20,237 +17,315 @@ 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.config.Configuration; public class ScreenHUDConfig extends ScreenBase { - private class EventCanvas extends LayoutBase{ - IWidget draggedWidget = null; - - float scale; - - public EventCanvas(IWidget parent, GuiScreen prevScreen){ - super(parent); - this.setGeometry(new WidgetGeometry(0.0,0.0,100.0,100.0,CType.RELXY, CType.RELXY)); - - /* - IWidget layoutX = this.addWidget("LayoutX", new LayoutBase(this)); - layoutX.setGeometry(new WidgetGeometry(40.0,50.0,20,60, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - layoutX.addWidget("ButtonXAdd", new ButtonLabel(null, "+")).setGeometry(new WidgetGeometry(0.0, 0.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - layoutX.addWidget("ButtonXSub", new ButtonLabel(null, "-")).setGeometry(new WidgetGeometry(0.0,100.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.BOTTOM)); - layoutX.addWidget("ValueDisplayX", new LabelFixedFont(null, "0")).setGeometry(new WidgetGeometry(50.0,50.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - */ - - /* - IWidget layoutY = this.addWidget("LayoutY", new LayoutBase(this)); - layoutY.setGeometry(new WidgetGeometry(50.0,50.0,20,60,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - layoutY.addWidget("ButtonYAdd", new ButtonLabel(null, "+")).setGeometry(new WidgetGeometry(0.0, 0.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - layoutY.addWidget("ButtonYSub", new ButtonLabel(null, "-")).setGeometry(new WidgetGeometry(0.0,100.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.BOTTOM)); - 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().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); - ((LayoutMargin)this.getWidget("Layout")).setMargins(picSX/2, picSX/2, picSY/2, picSY/2); - this.getWidget("Layout").addWidget("Picture", new PictureMovableRC(null, "waila:textures/config_template.png")).setGeometry(new WidgetGeometry(picX, picY, picSX, picSY,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + private class EventCanvas extends LayoutBase { - this.addWidget("TextTuto1", new LabelFixedFont(null, "screen.label.dragtuto")).setGeometry(new WidgetGeometry(50.0, 30.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER));; - - IWidget layoutX = this.addWidget("LayoutX", new LayoutBase(this)); - layoutX.setGeometry(new WidgetGeometry(35.0,50.0,20,80,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - layoutX.addWidget("LabelX", new LabelFixedFont(null, "X")) .setGeometry(new WidgetGeometry(50.0, 0.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - layoutX.addWidget("ButtonXAdd", new ButtonLabel(null, "+")) .setGeometry(new WidgetGeometry(0.0, 10.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - layoutX.addWidget("ValueDisplayX", new LabelFixedFont(null, "0")) .setGeometry(new WidgetGeometry(50.0, 40.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - layoutX.addWidget("ButtonXSub", new ButtonLabel(null, "-")) .setGeometry(new WidgetGeometry(0.0, 60.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - - IWidget layoutY = this.addWidget("LayoutY", new LayoutBase(this)); - layoutY.setGeometry(new WidgetGeometry(45.0,50.0,20,80,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - layoutY.addWidget("LabelY", new LabelFixedFont(null, "Y")) .setGeometry(new WidgetGeometry(50.0, 0.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - layoutY.addWidget("ButtonYAdd", new ButtonLabel(null, "+")) .setGeometry(new WidgetGeometry(0.0, 10.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - layoutY.addWidget("ValueDisplayY", new LabelFixedFont(null, "0")) .setGeometry(new WidgetGeometry(50.0, 40.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - layoutY.addWidget("ButtonYSub", new ButtonLabel(null, "-")) .setGeometry(new WidgetGeometry(0.0, 60.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - - IWidget layoutAlpha = this.addWidget("LayoutAlpha", new LayoutBase(this)); - layoutAlpha.setGeometry(new WidgetGeometry(55.0,50.0,20,80,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - layoutAlpha.addWidget("LabelAlpha", new LabelFixedFont(null, "Alpha")).setGeometry(new WidgetGeometry(50.0, 0.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - layoutAlpha.addWidget("ButtonAlphaAdd", new ButtonLabel(null, "+")) .setGeometry(new WidgetGeometry(0.0, 10.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - layoutAlpha.addWidget("ValueDisplayAlpha", new LabelFixedFont(null, "0")) .setGeometry(new WidgetGeometry(50.0, 40.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - layoutAlpha.addWidget("ButtonAlphaSub", new ButtonLabel(null, "-")) .setGeometry(new WidgetGeometry(0.0, 60.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - - IWidget layoutScale = this.addWidget("LayoutScale", new LayoutBase(this)); - layoutScale.setGeometry(new WidgetGeometry(65.0,50.0,20,80,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - layoutScale.addWidget("LabelScale", new LabelFixedFont(null, "screen.label.scale")).setGeometry(new WidgetGeometry(50.0, 0.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - layoutScale.addWidget("ButtonScaleAdd", new ButtonLabel(null, "+")) .setGeometry(new WidgetGeometry(0.0, 10.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - layoutScale.addWidget("ValueDisplayScale", new LabelFixedFont(null, "0")) .setGeometry(new WidgetGeometry(50.0, 40.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - layoutScale.addWidget("ButtonScaleSub", new ButtonLabel(null, "-")) .setGeometry(new WidgetGeometry(0.0, 60.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - - - this.addWidget("ButtonCancel", new ButtonScreenChange(null, "screen.button.cancel", prevScreen)).setGeometry(new WidgetGeometry(70.0,97.0,75,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.BOTTOM)); - this.addWidget("ButtonOk", new ButtonScreenChange(null, "screen.button.ok", prevScreen)).setGeometry(new WidgetGeometry(30.0,97.0,75,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.BOTTOM)); - this.addWidget("ButtonDefault",new ButtonLabel(null, "screen.button.default")).setGeometry(new WidgetGeometry(50.0,97.0,75,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.BOTTOM)); - + IWidget draggedWidget = null; - - ((LabelFixedFont)this.getWidget("LayoutX").getWidget("ValueDisplayX")).setText(String.format("%.2f", picX)); - ((LabelFixedFont)this.getWidget("LayoutY").getWidget("ValueDisplayY")).setText(String.format("%.2f", picY)); - ((LabelFixedFont)this.getWidget("LayoutAlpha").getWidget("ValueDisplayAlpha")).setText(String.format("%.2f", picAlpha)); - ((LabelFixedFont)this.getWidget("LayoutScale").getWidget("ValueDisplayScale")).setText(String.format("%.2f", scale)); - - this.getWidget("Layout").getWidget("Picture").setAlpha(picAlpha); - - } - - @Override - public IWidget getWidgetAtCoordinates(double posX, double posY){ - if (this.getWidget("Layout").getWidget("Picture").isWidgetAtCoordinates(posX, posY)) - return this.getWidget("Layout").getWidget("Picture"); - else - return super.getWidgetAtCoordinates(posX, posY); - } + float scale; - @Override - public void onMouseClick(MouseEvent event){ - //System.out.println(this.getWidgetAtCoordinates(event.x, event.y)); - - if ((event.button == 0) && (this.getWidget("Layout").getWidget("Picture").isWidgetAtCoordinates(event.x, event.y))){ - this.getWidget("Layout").getWidget("Picture").onMouseClick(event); - this.draggedWidget = this.getWidget("Layout").getWidget("Picture"); - } - else - super.onMouseClick(event); - } - - @Override - public void onMouseDrag(MouseEvent event){ - - //if ((this.getWidgetAtCoordinates(event.x, event.y) == this) && (this.draggedWidget != null)){ - if (this.draggedWidget != null){ - this.draggedWidget.onMouseDrag(event); - } else { - super.onMouseDrag(event); - } - } - - @Override - public void onMouseRelease(MouseEvent event){ - if (event.button == 0) - this.draggedWidget = null; - super.onMouseRelease(event); - } + public EventCanvas(IWidget parent, GuiScreen prevScreen) { + super(parent); + this.setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 100.0, CType.RELXY, CType.RELXY)); - - private void updateData(){ - ((LabelFixedFont)this.getWidget("LayoutX").getWidget("ValueDisplayX")).setText(String.format("%.2f", this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getX())); - ((LabelFixedFont)this.getWidget("LayoutY").getWidget("ValueDisplayY")).setText(String.format("%.2f", this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getY())); - ((LabelFixedFont)this.getWidget("LayoutAlpha").getWidget("ValueDisplayAlpha")).setText(String.format("%.2f", this.getWidget("Layout").getWidget("Picture").getAlpha())); - ((LabelFixedFont)this.getWidget("LayoutScale").getWidget("ValueDisplayScale")).setText(String.format("%.2f", scale)); - } - - @Override - public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params){ + /* + * IWidget layoutX = this.addWidget("LayoutX", new LayoutBase(this)); layoutX.setGeometry(new + * WidgetGeometry(40.0,50.0,20,60, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + * layoutX.addWidget("ButtonXAdd", new ButtonLabel(null, "+")).setGeometry(new WidgetGeometry(0.0, + * 0.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); layoutX.addWidget("ButtonXSub", new + * ButtonLabel(null, "-")).setGeometry(new WidgetGeometry(0.0,100.0,20,20, CType.RELXY, CType.ABSXY, + * WAlign.LEFT, WAlign.BOTTOM)); layoutX.addWidget("ValueDisplayX", new LabelFixedFont(null, + * "0")).setGeometry(new WidgetGeometry(50.0,50.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, + * WAlign.CENTER)); + */ - if (this.getWidget("Layout") == null) return; - - if (srcwidget.equals(this.getWidget("Layout").getWidget("Picture")) && signal == Signal.DRAGGED){ - this.draggedWidget = this.getWidget("Layout").getWidget("Picture"); - this.updateData(); - } + /* + * IWidget layoutY = this.addWidget("LayoutY", new LayoutBase(this)); layoutY.setGeometry(new + * WidgetGeometry(50.0,50.0,20,60,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + * layoutY.addWidget("ButtonYAdd", new ButtonLabel(null, "+")).setGeometry(new WidgetGeometry(0.0, + * 0.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); layoutY.addWidget("ButtonYSub", new + * ButtonLabel(null, "-")).setGeometry(new WidgetGeometry(0.0,100.0,20,20, CType.RELXY, CType.ABSXY, + * WAlign.LEFT, WAlign.BOTTOM)); layoutY.addWidget("ValueDisplayY", new LabelFixedFont(null, + * "0")).setGeometry(new WidgetGeometry(50.0,50.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, + * WAlign.CENTER)); + */ - if (signal == Signal.CLICKED){ - - IWidget picture = this.getWidget("Layout").getWidget("Picture"); - double pictureX = picture.getGeometry().getRawPos().getX(); - double pictureY = picture.getGeometry().getRawPos().getY(); - double pixelToPercentX = 100.0D / picture.getParent().getSize().getX(); - double pixelToPercentY = 100.0D / picture.getParent().getSize().getY(); - - if (srcwidget.equals(this.getWidget("LayoutX").getWidget("ButtonXAdd"))){ - double newPos = Math.min(pictureX + pixelToPercentX, 100.0); - picture.setPos(newPos, pictureY); - } - - if (srcwidget.equals(this.getWidget("LayoutX").getWidget("ButtonXSub"))){ - double newPos = Math.max(pictureX - pixelToPercentX, 0.0); - picture.setPos(newPos, pictureY); - } - - if (srcwidget.equals(this.getWidget("LayoutY").getWidget("ButtonYAdd"))){ - double newPos = Math.min(pictureY + pixelToPercentY, 100.0); - picture.setPos(pictureX, newPos); - } - - if (srcwidget.equals(this.getWidget("LayoutY").getWidget("ButtonYSub"))){ - double newPos = Math.max(pictureY - pixelToPercentY, 0.0); - picture.setPos(pictureX, newPos); - } + 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; - if (srcwidget.equals(this.getWidget("LayoutAlpha").getWidget("ButtonAlphaAdd"))) - picture.setAlpha(Math.min(picture.getAlpha() + 0.05f, 1.0f)); - - if (srcwidget.equals(this.getWidget("LayoutAlpha").getWidget("ButtonAlphaSub"))) - picture.setAlpha(Math.max(picture.getAlpha() - 0.05f, 0.0f)); + int picSX = (int) (180 / this.rez.getScaleFactor() * scale), + picSY = (int) (62 / this.rez.getScaleFactor() * scale); + this.addWidget("Layout", new LayoutMargin(null), RenderPriority.HIGH); + ((LayoutMargin) this.getWidget("Layout")).setMargins(picSX / 2, picSX / 2, picSY / 2, picSY / 2); + this.getWidget("Layout") + .addWidget("Picture", new PictureMovableRC(null, "waila:textures/config_template.png")).setGeometry( + new WidgetGeometry( + picX, + picY, + picSX, + picSY, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); - if (srcwidget.equals(this.getWidget("LayoutScale").getWidget("ButtonScaleAdd"))){ - scale += 0.05f; - scale = Math.max(0.10f, scale); - scale = Math.min(2.00f, scale); - - int picSX = (int)(180 / this.rez.getScaleFactor() * scale), picSY = (int)(62 / this.rez.getScaleFactor() * scale); - picture.setSize(picSX, picSY); - ((LayoutMargin)this.getWidget("Layout")).setMargins(picSX/2, picSX/2, picSY/2, picSY/2); - } - - if (srcwidget.equals(this.getWidget("LayoutScale").getWidget("ButtonScaleSub"))){ - scale -= 0.05f; - scale = Math.max(0.10f, scale); - scale = Math.min(2.00f, scale); - - int picSX = (int)(180 / this.rez.getScaleFactor() * scale), picSY = (int)(62 / this.rez.getScaleFactor() * scale); - picture.setSize(picSX, picSY); - ((LayoutMargin)this.getWidget("Layout")).setMargins(picSX/2, picSX/2, picSY/2, picSY/2); - } - - //picture.emit(Signal.DRAGGED, picture.getPos()); - this.updateData(); - - } - if (srcwidget.equals(this.getWidget("ButtonOk")) && signal == Signal.CLICKED){ - 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)); - - 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; - - OverlayConfig.updateColors(); - } - - if (srcwidget.equals(this.getWidget("ButtonDefault")) && signal == Signal.CLICKED){ - this.getWidget("Layout").getWidget("Picture").setPos(50.0, 1.0); - this.getWidget("Layout").getWidget("Picture").setAlpha(0.8f); - this.scale = 1.0f; - int picSX = (int)(180 / this.rez.getScaleFactor() * scale), picSY = (int)(62 / this.rez.getScaleFactor() * scale); - this.getWidget("Layout").getWidget("Picture").setSize(picSX, picSY); - ((LayoutMargin)this.getWidget("Layout")).setMargins(picSX/2, picSX/2, picSY/2, picSY/2); - - this.updateData(); - } - } - } - - public ScreenHUDConfig(GuiScreen parent){ - super(parent); - - this.getRoot().addWidget("EventCanvas", new EventCanvas(this.getRoot(), parent)); - } + this.addWidget("TextTuto1", new LabelFixedFont(null, "screen.label.dragtuto")).setGeometry( + new WidgetGeometry(50.0, 30.0, 20, 20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER));; + + IWidget layoutX = this.addWidget("LayoutX", new LayoutBase(this)); + layoutX.setGeometry( + new WidgetGeometry(35.0, 50.0, 20, 80, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutX.addWidget("LabelX", new LabelFixedFont(null, "X")).setGeometry( + new WidgetGeometry(50.0, 0.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutX.addWidget("ButtonXAdd", new ButtonLabel(null, "+")).setGeometry( + new WidgetGeometry(0.0, 10.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutX.addWidget("ValueDisplayX", new LabelFixedFont(null, "0")).setGeometry( + new WidgetGeometry(50.0, 40.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutX.addWidget("ButtonXSub", new ButtonLabel(null, "-")).setGeometry( + new WidgetGeometry(0.0, 60.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + IWidget layoutY = this.addWidget("LayoutY", new LayoutBase(this)); + layoutY.setGeometry( + new WidgetGeometry(45.0, 50.0, 20, 80, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutY.addWidget("LabelY", new LabelFixedFont(null, "Y")).setGeometry( + new WidgetGeometry(50.0, 0.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutY.addWidget("ButtonYAdd", new ButtonLabel(null, "+")).setGeometry( + new WidgetGeometry(0.0, 10.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutY.addWidget("ValueDisplayY", new LabelFixedFont(null, "0")).setGeometry( + new WidgetGeometry(50.0, 40.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutY.addWidget("ButtonYSub", new ButtonLabel(null, "-")).setGeometry( + new WidgetGeometry(0.0, 60.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + IWidget layoutAlpha = this.addWidget("LayoutAlpha", new LayoutBase(this)); + layoutAlpha.setGeometry( + new WidgetGeometry(55.0, 50.0, 20, 80, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutAlpha.addWidget("LabelAlpha", new LabelFixedFont(null, "Alpha")).setGeometry( + new WidgetGeometry(50.0, 0.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutAlpha.addWidget("ButtonAlphaAdd", new ButtonLabel(null, "+")).setGeometry( + new WidgetGeometry(0.0, 10.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutAlpha.addWidget("ValueDisplayAlpha", new LabelFixedFont(null, "0")).setGeometry( + new WidgetGeometry(50.0, 40.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutAlpha.addWidget("ButtonAlphaSub", new ButtonLabel(null, "-")).setGeometry( + new WidgetGeometry(0.0, 60.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + IWidget layoutScale = this.addWidget("LayoutScale", new LayoutBase(this)); + layoutScale.setGeometry( + new WidgetGeometry(65.0, 50.0, 20, 80, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutScale.addWidget("LabelScale", new LabelFixedFont(null, "screen.label.scale")).setGeometry( + new WidgetGeometry(50.0, 0.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutScale.addWidget("ButtonScaleAdd", new ButtonLabel(null, "+")).setGeometry( + new WidgetGeometry(0.0, 10.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutScale.addWidget("ValueDisplayScale", new LabelFixedFont(null, "0")).setGeometry( + new WidgetGeometry(50.0, 40.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutScale.addWidget("ButtonScaleSub", new ButtonLabel(null, "-")).setGeometry( + new WidgetGeometry(0.0, 60.0, 20, 20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + this.addWidget("ButtonCancel", new ButtonScreenChange(null, "screen.button.cancel", prevScreen)) + .setGeometry( + new WidgetGeometry( + 70.0, + 97.0, + 75, + 20, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.BOTTOM)); + this.addWidget("ButtonOk", new ButtonScreenChange(null, "screen.button.ok", prevScreen)).setGeometry( + new WidgetGeometry(30.0, 97.0, 75, 20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.BOTTOM)); + this.addWidget("ButtonDefault", new ButtonLabel(null, "screen.button.default")).setGeometry( + new WidgetGeometry(50.0, 97.0, 75, 20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.BOTTOM)); + + ((LabelFixedFont) this.getWidget("LayoutX").getWidget("ValueDisplayX")) + .setText(String.format("%.2f", picX)); + ((LabelFixedFont) this.getWidget("LayoutY").getWidget("ValueDisplayY")) + .setText(String.format("%.2f", picY)); + ((LabelFixedFont) this.getWidget("LayoutAlpha").getWidget("ValueDisplayAlpha")) + .setText(String.format("%.2f", picAlpha)); + ((LabelFixedFont) this.getWidget("LayoutScale").getWidget("ValueDisplayScale")) + .setText(String.format("%.2f", scale)); + + this.getWidget("Layout").getWidget("Picture").setAlpha(picAlpha); + + } + + @Override + public IWidget getWidgetAtCoordinates(double posX, double posY) { + if (this.getWidget("Layout").getWidget("Picture").isWidgetAtCoordinates(posX, posY)) + return this.getWidget("Layout").getWidget("Picture"); + else return super.getWidgetAtCoordinates(posX, posY); + } + + @Override + public void onMouseClick(MouseEvent event) { + // System.out.println(this.getWidgetAtCoordinates(event.x, event.y)); + + if ((event.button == 0) + && (this.getWidget("Layout").getWidget("Picture").isWidgetAtCoordinates(event.x, event.y))) { + this.getWidget("Layout").getWidget("Picture").onMouseClick(event); + this.draggedWidget = this.getWidget("Layout").getWidget("Picture"); + } else super.onMouseClick(event); + } + + @Override + public void onMouseDrag(MouseEvent event) { + + // if ((this.getWidgetAtCoordinates(event.x, event.y) == this) && (this.draggedWidget != null)){ + if (this.draggedWidget != null) { + this.draggedWidget.onMouseDrag(event); + } else { + super.onMouseDrag(event); + } + } + + @Override + public void onMouseRelease(MouseEvent event) { + if (event.button == 0) this.draggedWidget = null; + super.onMouseRelease(event); + } + + private void updateData() { + ((LabelFixedFont) this.getWidget("LayoutX").getWidget("ValueDisplayX")).setText( + String.format( + "%.2f", + this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getX())); + ((LabelFixedFont) this.getWidget("LayoutY").getWidget("ValueDisplayY")).setText( + String.format( + "%.2f", + this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getY())); + ((LabelFixedFont) this.getWidget("LayoutAlpha").getWidget("ValueDisplayAlpha")) + .setText(String.format("%.2f", this.getWidget("Layout").getWidget("Picture").getAlpha())); + ((LabelFixedFont) this.getWidget("LayoutScale").getWidget("ValueDisplayScale")) + .setText(String.format("%.2f", scale)); + } + + @Override + public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params) { + + if (this.getWidget("Layout") == null) return; + + if (srcwidget.equals(this.getWidget("Layout").getWidget("Picture")) && signal == Signal.DRAGGED) { + this.draggedWidget = this.getWidget("Layout").getWidget("Picture"); + this.updateData(); + } + + if (signal == Signal.CLICKED) { + + IWidget picture = this.getWidget("Layout").getWidget("Picture"); + double pictureX = picture.getGeometry().getRawPos().getX(); + double pictureY = picture.getGeometry().getRawPos().getY(); + double pixelToPercentX = 100.0D / picture.getParent().getSize().getX(); + double pixelToPercentY = 100.0D / picture.getParent().getSize().getY(); + + if (srcwidget.equals(this.getWidget("LayoutX").getWidget("ButtonXAdd"))) { + double newPos = Math.min(pictureX + pixelToPercentX, 100.0); + picture.setPos(newPos, pictureY); + } + + if (srcwidget.equals(this.getWidget("LayoutX").getWidget("ButtonXSub"))) { + double newPos = Math.max(pictureX - pixelToPercentX, 0.0); + picture.setPos(newPos, pictureY); + } + + if (srcwidget.equals(this.getWidget("LayoutY").getWidget("ButtonYAdd"))) { + double newPos = Math.min(pictureY + pixelToPercentY, 100.0); + picture.setPos(pictureX, newPos); + } + + if (srcwidget.equals(this.getWidget("LayoutY").getWidget("ButtonYSub"))) { + double newPos = Math.max(pictureY - pixelToPercentY, 0.0); + picture.setPos(pictureX, newPos); + } + + if (srcwidget.equals(this.getWidget("LayoutAlpha").getWidget("ButtonAlphaAdd"))) + picture.setAlpha(Math.min(picture.getAlpha() + 0.05f, 1.0f)); + + if (srcwidget.equals(this.getWidget("LayoutAlpha").getWidget("ButtonAlphaSub"))) + picture.setAlpha(Math.max(picture.getAlpha() - 0.05f, 0.0f)); + + if (srcwidget.equals(this.getWidget("LayoutScale").getWidget("ButtonScaleAdd"))) { + scale += 0.05f; + scale = Math.max(0.10f, scale); + scale = Math.min(2.00f, scale); + + int picSX = (int) (180 / this.rez.getScaleFactor() * scale), + picSY = (int) (62 / this.rez.getScaleFactor() * scale); + picture.setSize(picSX, picSY); + ((LayoutMargin) this.getWidget("Layout")).setMargins(picSX / 2, picSX / 2, picSY / 2, picSY / 2); + } + + if (srcwidget.equals(this.getWidget("LayoutScale").getWidget("ButtonScaleSub"))) { + scale -= 0.05f; + scale = Math.max(0.10f, scale); + scale = Math.min(2.00f, scale); + + int picSX = (int) (180 / this.rez.getScaleFactor() * scale), + picSY = (int) (62 / this.rez.getScaleFactor() * scale); + picture.setSize(picSX, picSY); + ((LayoutMargin) this.getWidget("Layout")).setMargins(picSX / 2, picSX / 2, picSY / 2, picSY / 2); + } + + // picture.emit(Signal.DRAGGED, picture.getPos()); + this.updateData(); + + } + if (srcwidget.equals(this.getWidget("ButtonOk")) && signal == Signal.CLICKED) { + 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)); + + 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; + + OverlayConfig.updateColors(); + } + + if (srcwidget.equals(this.getWidget("ButtonDefault")) && signal == Signal.CLICKED) { + this.getWidget("Layout").getWidget("Picture").setPos(50.0, 1.0); + this.getWidget("Layout").getWidget("Picture").setAlpha(0.8f); + this.scale = 1.0f; + int picSX = (int) (180 / this.rez.getScaleFactor() * scale), + picSY = (int) (62 / this.rez.getScaleFactor() * scale); + this.getWidget("Layout").getWidget("Picture").setSize(picSX, picSY); + ((LayoutMargin) this.getWidget("Layout")).setMargins(picSX / 2, picSX / 2, picSY / 2, picSY / 2); + + this.updateData(); + } + } + } + + public ScreenHUDConfig(GuiScreen parent) { + super(parent); + + this.getRoot().addWidget("EventCanvas", new EventCanvas(this.getRoot(), parent)); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java index 2815ec0..64adf20 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java @@ -8,24 +8,30 @@ import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.WidgetGeometry; import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer; import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; + import net.minecraft.client.gui.GuiScreen; public class ScreenModuleChoice extends ScreenBase { - - public ScreenModuleChoice(GuiScreen parent){ - super(parent); - this.getRoot().addWidget("ButtonContainer", new ButtonContainer(this.getRoot(), 3, 100, 25.0)); - this.getRoot().getWidget("ButtonContainer").setGeometry(new WidgetGeometry(50.0, 20.0, 400.0, 60.0, CType.RELXY, CType.REL_Y, WAlign.CENTER, WAlign.TOP)); - - ButtonContainer buttonContainer = ((ButtonContainer)this.getRoot().getWidget("ButtonContainer")); - + public ScreenModuleChoice(GuiScreen parent) { + super(parent); + + this.getRoot().addWidget("ButtonContainer", new ButtonContainer(this.getRoot(), 3, 100, 25.0)); + this.getRoot().getWidget("ButtonContainer").setGeometry( + new WidgetGeometry(50.0, 20.0, 400.0, 60.0, CType.RELXY, CType.REL_Y, WAlign.CENTER, WAlign.TOP)); + + ButtonContainer buttonContainer = ((ButtonContainer) this.getRoot().getWidget("ButtonContainer")); + for (String key : ConfigHandler.instance().getModuleNames()) - buttonContainer.addButton( new ButtonScreenChange(this.getRoot(), key, new ScreenModuleConfig(this, key))); - - this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); - this.getRoot().getWidget("LayoutBack").setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); - this.getRoot().getWidget("LayoutBack").addWidget("ButtonBack", new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "Back", this.parent)); - this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - } + buttonContainer.addButton(new ButtonScreenChange(this.getRoot(), key, new ScreenModuleConfig(this, key))); + + this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutBack") + .setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutBack").addWidget( + "ButtonBack", + new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "Back", this.parent)); + this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry( + new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java index 20b758c..c7560cd 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java @@ -8,41 +8,59 @@ import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.WidgetGeometry; import mcp.mobius.waila.gui.widgets.buttons.ButtonBooleanConfig; 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 { - private String modName; - - public ScreenModuleConfig(GuiScreen parent, String modname){ - super(parent); - - this.modName = modname; - - this.getRoot().addWidget("ButtonContainer", new ButtonContainerLabel(this.getRoot(), 2, 100, 25.0)); - this.getRoot().getWidget("ButtonContainer").setGeometry(new WidgetGeometry(0.0, 20.0, 100.0, 60.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.TOP)); - - ButtonContainerLabel buttonContainer = ((ButtonContainerLabel)this.getRoot().getWidget("ButtonContainer")); - - for (String key:ConfigHandler.instance().getConfigKeys(this.modName).keySet()){ - if (ConfigHandler.instance().isServerRequired(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(), 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 )); - } - - this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); - this.getRoot().getWidget("LayoutBack").setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); - this.getRoot().getWidget("LayoutBack").addWidget("ButtonBack", new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "screen.button.back", this.parent)); - this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - } - - + private String modName; + + public ScreenModuleConfig(GuiScreen parent, String modname) { + super(parent); + + this.modName = modname; + + this.getRoot().addWidget("ButtonContainer", new ButtonContainerLabel(this.getRoot(), 2, 100, 25.0)); + this.getRoot().getWidget("ButtonContainer").setGeometry( + new WidgetGeometry(0.0, 20.0, 100.0, 60.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.TOP)); + + ButtonContainerLabel buttonContainer = ((ButtonContainerLabel) this.getRoot().getWidget("ButtonContainer")); + + for (String key : ConfigHandler.instance().getConfigKeys(this.modName).keySet()) { + if (ConfigHandler.instance().isServerRequired(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(), + 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 )); + } + + this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutBack") + .setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutBack").addWidget( + "ButtonBack", + new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "screen.button.back", this.parent)); + this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry( + new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } + } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java index 0be8fc8..3ec84a5 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java @@ -1,7 +1,5 @@ package mcp.mobius.waila.gui.screens.config; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.Configuration; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; @@ -9,35 +7,99 @@ import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.WidgetGeometry; 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){ - super(parent); - - this.getRoot().addWidget("ButtonContainer", new ButtonContainerLabel(this.getRoot(), 2, 100, 25.0)); - this.getRoot().getWidget("ButtonContainer").setGeometry(new WidgetGeometry(0.0, 10.0, 100.0, 50.0, CType.RELXY, CType.RELXY)); - - ButtonContainerLabel buttonContainer = ((ButtonContainerLabel)this.getRoot().getWidget("ButtonContainer")); - - 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"); - +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.Configuration; - this.getRoot().addWidget("LayoutConfigPos", new LayoutBase(this.getRoot())); - this.getRoot().getWidget("LayoutConfigPos").setGeometry(new WidgetGeometry(0.0, 50.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); - this.getRoot().getWidget("LayoutConfigPos").addWidget("ButtonConfigPos", new ButtonScreenChange(null, "screen.button.configureaspect", new ScreenHUDConfig(this))); - this.getRoot().getWidget("LayoutConfigPos").getWidget("ButtonConfigPos").setGeometry(new WidgetGeometry(50.0, 50.0, 150.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - - this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); - this.getRoot().getWidget("LayoutBack").setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); - this.getRoot().getWidget("LayoutBack").addWidget("ButtonBack", new ButtonScreenChange(null, "screen.button.back", this.parent)); - this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - } +public class ScreenWailaConfig extends ScreenBase { + + public ScreenWailaConfig(GuiScreen parent) { + super(parent); + + this.getRoot().addWidget("ButtonContainer", new ButtonContainerLabel(this.getRoot(), 2, 100, 25.0)); + this.getRoot().getWidget("ButtonContainer") + .setGeometry(new WidgetGeometry(0.0, 10.0, 100.0, 50.0, CType.RELXY, CType.RELXY)); + + ButtonContainerLabel buttonContainer = ((ButtonContainerLabel) this.getRoot().getWidget("ButtonContainer")); + + 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())); + this.getRoot().getWidget("LayoutConfigPos") + .setGeometry(new WidgetGeometry(0.0, 50.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutConfigPos").addWidget( + "ButtonConfigPos", + new ButtonScreenChange(null, "screen.button.configureaspect", new ScreenHUDConfig(this))); + this.getRoot().getWidget("LayoutConfigPos").getWidget("ButtonConfigPos").setGeometry( + new WidgetGeometry(50.0, 50.0, 150.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + + this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutBack") + .setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutBack") + .addWidget("ButtonBack", new ButtonScreenChange(null, "screen.button.back", this.parent)); + this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry( + new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java index 43945b5..4aeef15 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java @@ -1,8 +1,6 @@ package mcp.mobius.waila.gui.screens.info; import mcp.mobius.waila.cbcore.LangUtil; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; @@ -12,68 +10,79 @@ import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.ViewTable; import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; + public class ScreenEnchants extends ScreenBase { - - public ScreenEnchants(GuiScreen parent) { - super(parent); - this.getRoot().addWidget("Layout_Title", new LayoutBase(null)) - .setGeometry(new WidgetGeometry(50.0, 10.0, 50.0, 32.0, CType.REL_X, CType.REL_X, WAlign.CENTER, WAlign.TOP)); - - this.getRoot().getWidget("Layout_Title").addWidget("ItemStack", new ItemStackDisplay(null)) - .setGeometry(new WidgetGeometry(0.0, 0.0, 32.0, 32.0, CType.ABSXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + public ScreenEnchants(GuiScreen parent) { + super(parent); - this.getRoot().getWidget("Layout_Title").addWidget("LabelName", new LabelFixedFont(null, "None")) - .setGeometry(new WidgetGeometry(40.0, 4.0, 16.0, 16.0, CType.ABSXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + this.getRoot().addWidget("Layout_Title", new LayoutBase(null)).setGeometry( + new WidgetGeometry(50.0, 10.0, 50.0, 32.0, CType.REL_X, CType.REL_X, WAlign.CENTER, WAlign.TOP)); - this.getRoot().getWidget("Layout_Title").addWidget("LabelEnchantability", new LabelFixedFont(null, "None")) - .setGeometry(new WidgetGeometry(40.0, 22.0, 16.0, 16.0, CType.ABSXY, CType.REL_X, WAlign.LEFT, WAlign.BOTTOM)); - - this.getRoot().addWidget("Table", new ViewTable(null)) - .setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 80.0, CType.REL_X, CType.RELXY, WAlign.CENTER, WAlign.TOP)); + this.getRoot().getWidget("Layout_Title").addWidget("ItemStack", new ItemStackDisplay(null)).setGeometry( + new WidgetGeometry(0.0, 0.0, 32.0, 32.0, CType.ABSXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); - String columnName = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.name"); - String columnMinLvl= "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.minlvl");; - String columnMaxLvl= "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.maxlvl");; - String columnWeight= "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.weight");; - - ((ViewTable)this.getRoot().getWidget("Table")) - .setColumnsTitle(columnName, columnMinLvl, columnMaxLvl, columnWeight, "\u00a7a\u00a7oMod") - .setColumnsWidth(35.0, 10.0, 10.0, 10.0, 35.0) - .setColumnsAlign(WAlign.LEFT, WAlign.CENTER, WAlign.CENTER, WAlign.CENTER, WAlign.LEFT); - } - - public ViewTable getTable(){ - return (ViewTable)this.getRoot().getWidget("Table"); - } - - public ScreenEnchants addRow(String...strings ){ - this.getTable().addRow(strings); - return this; - } - - public ScreenEnchants setStack(ItemStack stack){ - ((ItemStackDisplay)this.getRoot().getWidget("Layout_Title").getWidget("ItemStack")).setStack(stack); - this.getRoot().getWidget("Layout_Title").adjustSize(); - return this; - } - - public ScreenEnchants setName(String name){ - ((LabelFixedFont)this.getRoot().getWidget("Layout_Title").getWidget("LabelName")).setText(name); - this.getRoot().getWidget("Layout_Title").adjustSize(); - return this; - } - - public ScreenEnchants setEnchantability(String value){ - ((LabelFixedFont)this.getRoot().getWidget("Layout_Title").getWidget("LabelEnchantability")).setText(String.format("%s : %s", LangUtil.translateG("enchant.label.enchantability"), value)); - this.getRoot().getWidget("Layout_Title").adjustSize(); - return this; - } - - /* - public ScreenEnchants setStack(ItemStack stack){ - ((ItemStackDisplay)this.getRoot().getWidget("ItemStack")).setStack(stack); - return this; - } - */ -} + this.getRoot().getWidget("Layout_Title").addWidget("LabelName", new LabelFixedFont(null, "None")).setGeometry( + new WidgetGeometry(40.0, 4.0, 16.0, 16.0, CType.ABSXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + this.getRoot().getWidget("Layout_Title").addWidget("LabelEnchantability", new LabelFixedFont(null, "None")) + .setGeometry( + new WidgetGeometry( + 40.0, + 22.0, + 16.0, + 16.0, + CType.ABSXY, + CType.REL_X, + WAlign.LEFT, + WAlign.BOTTOM)); + + this.getRoot().addWidget("Table", new ViewTable(null)).setGeometry( + new WidgetGeometry(50.0, 50.0, 90.0, 80.0, CType.REL_X, CType.RELXY, WAlign.CENTER, WAlign.TOP)); + + String columnName = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.name"); + String columnMinLvl = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.minlvl");; + String columnMaxLvl = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.maxlvl");; + String columnWeight = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.weight");; + + ((ViewTable) this.getRoot().getWidget("Table")) + .setColumnsTitle(columnName, columnMinLvl, columnMaxLvl, columnWeight, "\u00a7a\u00a7oMod") + .setColumnsWidth(35.0, 10.0, 10.0, 10.0, 35.0) + .setColumnsAlign(WAlign.LEFT, WAlign.CENTER, WAlign.CENTER, WAlign.CENTER, WAlign.LEFT); + } + + public ViewTable getTable() { + return (ViewTable) this.getRoot().getWidget("Table"); + } + + public ScreenEnchants addRow(String... strings) { + this.getTable().addRow(strings); + return this; + } + + public ScreenEnchants setStack(ItemStack stack) { + ((ItemStackDisplay) this.getRoot().getWidget("Layout_Title").getWidget("ItemStack")).setStack(stack); + this.getRoot().getWidget("Layout_Title").adjustSize(); + return this; + } + + public ScreenEnchants setName(String name) { + ((LabelFixedFont) this.getRoot().getWidget("Layout_Title").getWidget("LabelName")).setText(name); + this.getRoot().getWidget("Layout_Title").adjustSize(); + return this; + } + + public ScreenEnchants setEnchantability(String value) { + ((LabelFixedFont) this.getRoot().getWidget("Layout_Title").getWidget("LabelEnchantability")) + .setText(String.format("%s : %s", LangUtil.translateG("enchant.label.enchantability"), value)); + this.getRoot().getWidget("Layout_Title").adjustSize(); + return this; + } + + /* + * public ScreenEnchants setStack(ItemStack stack){ + * ((ItemStackDisplay)this.getRoot().getWidget("ItemStack")).setStack(stack); return this; } + */ +} diff --git a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java index 8dfd438..dfbc4c2 100644 --- a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java +++ b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java @@ -1,70 +1,43 @@ package mcp.mobius.waila.gui.testing; -import org.lwjgl.util.Point; - -import mcp.mobius.waila.gui.events.MouseEvent; -import mcp.mobius.waila.gui.helpers.UIException; import mcp.mobius.waila.gui.interfaces.CType; -import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; -import mcp.mobius.waila.gui.widgets.ItemStackDisplay; -import mcp.mobius.waila.gui.widgets.LabelFixedFont; -import mcp.mobius.waila.gui.widgets.LayoutBase; -import mcp.mobius.waila.gui.widgets.LayoutCropping; -import mcp.mobius.waila.gui.widgets.PictureDisplay; -import mcp.mobius.waila.gui.widgets.PictureSwitch; import mcp.mobius.waila.gui.widgets.ViewTable; -import mcp.mobius.waila.gui.widgets.ViewportScrollable; -import mcp.mobius.waila.gui.widgets.WidgetBase; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import mcp.mobius.waila.gui.widgets.buttons.ButtonBoolean; -import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; -import mcp.mobius.waila.gui.widgets.buttons.ButtonInteger; -import mcp.mobius.waila.gui.widgets.buttons.ButtonIntegerConfig; -import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; -import mcp.mobius.waila.gui.widgets.movable.PictureMovableRC; -import net.minecraft.block.Block; + import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; public class ScreenTest extends ScreenBase { - - public ScreenTest(GuiScreen parent) { - super(parent); - this.getRoot().addWidget("Test", new ViewTable(null)) - .setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 90.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - ((ViewTable)this.getRoot().getWidget("Test")) - .setColumnsTitle("Column1","Column2","Column3") - .setColumnsWidth(30.0,30.0,30.0) - .setColumnsAlign(WAlign.CENTER, WAlign.CENTER, WAlign.CENTER) - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3") - .addRow("test1", "test2", "test3"); - - - /* - this.getRoot().addWidget("Test", new Row(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 20.0, CType.RELXY, CType.REL_X, WAlign.CENTER, WAlign.CENTER)); - ((Row)this.getRoot().getWidget("Test")).setColumnsText("aabbbbbbbbbbbbbbbbbbbbbbbbb","bb","cc"); - ((Row)this.getRoot().getWidget("Test")).setColumnsWidth(30.0,30.0,30.0); - ((Row)this.getRoot().getWidget("Test")).setColumnsAlign(WAlign.LEFT, WAlign.CENTER, WAlign.CENTER); - */ - - - //this.getRoot().addWidget("TestLayout", new LayoutBase(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 90.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - //((LayoutBase)this.getRoot().getWidget("TestLayout")).setBackgroundColors(0xff505050, 0xff505050); - - //this.getRoot().addWidget("Layout", new ViewportScrollable(null)).setGeometry(new WidgetGeometry(50.0,50.0,75.0,75.0,CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - //((ViewportScrollable)this.getRoot().getWidget("Layout")).attachWidget(new PictureSwitch(this.getRoot(), "waila:textures/test.png", "waila:textures/test_solar.png")).setSize(900, 900); - + public ScreenTest(GuiScreen parent) { + super(parent); - } + this.getRoot().addWidget("Test", new ViewTable(null)).setGeometry( + new WidgetGeometry(50.0, 50.0, 90.0, 90.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + ((ViewTable) this.getRoot().getWidget("Test")).setColumnsTitle("Column1", "Column2", "Column3") + .setColumnsWidth(30.0, 30.0, 30.0).setColumnsAlign(WAlign.CENTER, WAlign.CENTER, WAlign.CENTER) + .addRow("test1", "test2", "test3").addRow("test1", "test2", "test3").addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3").addRow("test1", "test2", "test3").addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3").addRow("test1", "test2", "test3").addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3"); + + /* + * this.getRoot().addWidget("Test", new Row(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 20.0, + * CType.RELXY, CType.REL_X, WAlign.CENTER, WAlign.CENTER)); + * ((Row)this.getRoot().getWidget("Test")).setColumnsText("aabbbbbbbbbbbbbbbbbbbbbbbbb","bb","cc"); + * ((Row)this.getRoot().getWidget("Test")).setColumnsWidth(30.0,30.0,30.0); + * ((Row)this.getRoot().getWidget("Test")).setColumnsAlign(WAlign.LEFT, WAlign.CENTER, WAlign.CENTER); + */ + + // this.getRoot().addWidget("TestLayout", new LayoutBase(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, + // 90.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + // ((LayoutBase)this.getRoot().getWidget("TestLayout")).setBackgroundColors(0xff505050, 0xff505050); + + // this.getRoot().addWidget("Layout", new ViewportScrollable(null)).setGeometry(new + // WidgetGeometry(50.0,50.0,75.0,75.0,CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + // ((ViewportScrollable)this.getRoot().getWidget("Layout")).attachWidget(new PictureSwitch(this.getRoot(), + // "waila:textures/test.png", "waila:textures/test_solar.png")).setSize(900, 900); + + } } diff --git a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java index a5844ad..56b61bf 100644 --- a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java +++ b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java @@ -1,29 +1,34 @@ package mcp.mobius.waila.gui.testing; -import net.minecraft.client.gui.GuiScreen; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetGeometry; import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; -import mcp.mobius.waila.gui.widgets.buttons.ButtonIntegerConfig; + +import net.minecraft.client.gui.GuiScreen; public class ScreenTest2 extends ScreenBase { - public ScreenTest2(GuiScreen parent) { - super(parent); - //this.getRoot().addWidget("Picture", new PictureSwitch(this.getRoot(), "waila:textures/test.png", "waila:textures/test_solar.png")); - //this.getRoot().addWidget("Button", new ButtonInteger(this.getRoot(), "Val0", "Val1", "Val2")); - //this.getRoot().getWidget("Button").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, true, false, WidgetAlign.CENTER, WidgetAlign.CENTER)); - - this.getRoot().addWidget("Buttons", new ButtonContainerLabel(this.getRoot(), 2, 100, 30.0)); - this.getRoot().getWidget("Buttons").setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 50.0, CType.RELXY, CType.RELXY)); - - //((ButtonContainer)this.getRoot().getWidget("Buttons")).addButton(new ButtonIntegerConfig(this.getRoot(), "testconfig", true, 0, "Val0", "Val1", "Val2")); - - this.getRoot().addWidget("Text", new LabelFixedFont(this.getRoot(), "waila:textures/test.png")); - this.getRoot().getWidget("Text").setGeometry(new WidgetGeometry(50.0D, 10.0D, 50.0D, 50.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); - } - + public ScreenTest2(GuiScreen parent) { + super(parent); + // this.getRoot().addWidget("Picture", new PictureSwitch(this.getRoot(), "waila:textures/test.png", + // "waila:textures/test_solar.png")); + // this.getRoot().addWidget("Button", new ButtonInteger(this.getRoot(), "Val0", "Val1", "Val2")); + // this.getRoot().getWidget("Button").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, true, false, + // WidgetAlign.CENTER, WidgetAlign.CENTER)); + + this.getRoot().addWidget("Buttons", new ButtonContainerLabel(this.getRoot(), 2, 100, 30.0)); + this.getRoot().getWidget("Buttons") + .setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 50.0, CType.RELXY, CType.RELXY)); + + // ((ButtonContainer)this.getRoot().getWidget("Buttons")).addButton(new ButtonIntegerConfig(this.getRoot(), + // "testconfig", true, 0, "Val0", "Val1", "Val2")); + + this.getRoot().addWidget("Text", new LabelFixedFont(this.getRoot(), "waila:textures/test.png")); + this.getRoot().getWidget("Text").setGeometry( + new WidgetGeometry(50.0D, 10.0D, 50.0D, 50.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + } + } diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java index cf32b5c..db50809 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java @@ -1,120 +1,110 @@ package mcp.mobius.waila.gui.truetyper; /** -* TrueTyper: Open Source TTF implementation for Minecraft. -* Copyright (C) 2013 - Mr_okushama -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * TrueTyper: Open Source TTF implementation for Minecraft. Copyright (C) 2013 - Mr_okushama + * + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later + * version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. If not, see + * . + */ import java.nio.FloatBuffer; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; + import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Matrix4f; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraftforge.client.GuiIngameForge; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.common.MinecraftForge; - public class FontHelper { - - private static String formatEscape = "\u00A7"; + private static String formatEscape = "\u00A7"; - /* - public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float... rgba){ - drawString(s,x,y,font,scaleX,scaleY,0,rgba); + /* + * public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float... + * rgba){ drawString(s,x,y,font,scaleX,scaleY,0,rgba); } + */ - } - */ + public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, + float rotationZ, float... rgba) { + Minecraft mc = Minecraft.getMinecraft(); + ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + if (mc.gameSettings.hideGUI) { + return; + } + int amt = 1; + if (sr.getScaleFactor() == 1) { + amt = 2; + } - public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float rotationZ, float... rgba){ - Minecraft mc = Minecraft.getMinecraft(); - ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - if(mc.gameSettings.hideGUI){ - return; - } - int amt = 1; - if(sr.getScaleFactor() == 1){ - amt = 2; - } - - FloatBuffer matrixData = BufferUtils.createFloatBuffer(16); - GL11.glGetFloat(GL11.GL_MODELVIEW_MATRIX, matrixData); - FontHelper.set2DMode(matrixData); - GL11.glPushMatrix(); - y = mc.displayHeight-(y*sr.getScaleFactor())-(((font.getLineHeight()/amt))); - float tx = (x*sr.getScaleFactor())+(font.getWidth(s)/2); - float tranx = tx+2; - float trany = y+(font.getLineHeight()/2); - GL11.glTranslatef(tranx,trany,0); - GL11.glRotatef(rotationZ, 0f, 0f, 1f); - GL11.glTranslatef(-tranx,-trany,0); + FloatBuffer matrixData = BufferUtils.createFloatBuffer(16); + GL11.glGetFloat(GL11.GL_MODELVIEW_MATRIX, matrixData); + FontHelper.set2DMode(matrixData); + GL11.glPushMatrix(); + y = mc.displayHeight - (y * sr.getScaleFactor()) - (((font.getLineHeight() / amt))); + float tx = (x * sr.getScaleFactor()) + (font.getWidth(s) / 2); + float tranx = tx + 2; + float trany = y + (font.getLineHeight() / 2); + GL11.glTranslatef(tranx, trany, 0); + GL11.glRotatef(rotationZ, 0f, 0f, 1f); + GL11.glTranslatef(-tranx, -trany, 0); - - GL11.glEnable(GL11.GL_BLEND); - if(s.contains(formatEscape)){ - String[] pars = s.split(formatEscape); - float totalOffset = 0; - for(int i = 0; i < pars.length; i++){ - String par = pars[i]; - float[] c = rgba; - if(i > 0){ - c = Formatter.getFormatted(par.charAt(0)); - par = par.substring(1, par.length()); - } - font.drawString((x*sr.getScaleFactor()+totalOffset), y, par, scaleX/amt, scaleY/amt, c); - totalOffset += font.getWidth(par); - } - }else{ - font.drawString((x*sr.getScaleFactor()), y, s, scaleX/amt, scaleY/amt, rgba); - } - GL11.glPopMatrix(); - GL11.glDisable(GL11.GL_BLEND); - FontHelper.set3DMode(); - } + GL11.glEnable(GL11.GL_BLEND); + if (s.contains(formatEscape)) { + String[] pars = s.split(formatEscape); + float totalOffset = 0; + for (int i = 0; i < pars.length; i++) { + String par = pars[i]; + float[] c = rgba; + if (i > 0) { + c = Formatter.getFormatted(par.charAt(0)); + par = par.substring(1, par.length()); + } + font.drawString((x * sr.getScaleFactor() + totalOffset), y, par, scaleX / amt, scaleY / amt, c); + totalOffset += font.getWidth(par); + } + } else { + font.drawString((x * sr.getScaleFactor()), y, s, scaleX / amt, scaleY / amt, rgba); + } + GL11.glPopMatrix(); + GL11.glDisable(GL11.GL_BLEND); + FontHelper.set3DMode(); + } - private static void set2DMode(FloatBuffer matrixData) { - Minecraft mc = Minecraft.getMinecraft(); - ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - mc.entityRenderer.setupOverlayRendering(); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glPushMatrix(); - //GL11.glLoadMatrix(matrixData); + private static void set2DMode(FloatBuffer matrixData) { + Minecraft mc = Minecraft.getMinecraft(); + ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + mc.entityRenderer.setupOverlayRendering(); + GL11.glMatrixMode(GL11.GL_PROJECTION); + GL11.glPushMatrix(); + // GL11.glLoadMatrix(matrixData); - GL11.glLoadIdentity(); - GL11.glOrtho(0, mc.displayWidth, 0, mc.displayHeight, -1, 1); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glPushMatrix(); - GL11.glLoadIdentity(); - - Matrix4f matrix = new Matrix4f(); - matrix.load(matrixData); - GL11.glTranslatef(matrix.m30*sr.getScaleFactor(),-matrix.m31*sr.getScaleFactor(), 0f); + GL11.glLoadIdentity(); + GL11.glOrtho(0, mc.displayWidth, 0, mc.displayHeight, -1, 1); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glPushMatrix(); + GL11.glLoadIdentity(); - } + Matrix4f matrix = new Matrix4f(); + matrix.load(matrixData); + GL11.glTranslatef(matrix.m30 * sr.getScaleFactor(), -matrix.m31 * sr.getScaleFactor(), 0f); - private static void set3DMode() { - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glPopMatrix(); - Minecraft mc = Minecraft.getMinecraft(); - mc.entityRenderer.setupOverlayRendering(); - } + } + + private static void set3DMode() { + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_PROJECTION); + GL11.glPopMatrix(); + Minecraft mc = Minecraft.getMinecraft(); + mc.entityRenderer.setupOverlayRendering(); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java b/src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java index 232bb83..3939e57 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java @@ -1,69 +1,60 @@ package mcp.mobius.waila.gui.truetyper; /** -* TrueTyper: Open Source TTF implementation for Minecraft. -* Copyright (C) 2013 - Mr_okushama -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * TrueTyper: Open Source TTF implementation for Minecraft. Copyright (C) 2013 - Mr_okushama + * + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later + * version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. If not, see + * . + */ import java.awt.Font; -import java.awt.FontFormatException; -import java.awt.geom.AffineTransform; -import java.io.IOException; -import java.util.ArrayList; - - import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; -public class FontLoader{ - - public static TrueTypeFont loadSystemFont(String name, float defSize, boolean antialias){ - return loadSystemFont(name, defSize, antialias, Font.TRUETYPE_FONT); - - } +public class FontLoader { - public static TrueTypeFont loadSystemFont(String name, float defSize, boolean antialias, int type){ - Font font; - TrueTypeFont out = null; - try { - font = new Font(name, type, (int)defSize); - font = font.deriveFont(defSize); - out = new TrueTypeFont(font, antialias); - } catch (Exception e) { - e.printStackTrace(); - } - return out; - } + public static TrueTypeFont loadSystemFont(String name, float defSize, boolean antialias) { + return loadSystemFont(name, defSize, antialias, Font.TRUETYPE_FONT); - public static TrueTypeFont createFont(ResourceLocation res, float defSize, boolean antialias){ - return createFont(res, defSize, antialias, Font.TRUETYPE_FONT); - } + } - public static TrueTypeFont createFont(ResourceLocation res, float defSize, boolean antialias, int type){ - Font font; - TrueTypeFont out = null; - try { - font = Font.createFont(type, Minecraft.getMinecraft().getResourceManager().getResource(res).getInputStream()); - font = font.deriveFont(defSize); - out = new TrueTypeFont(font, antialias); - } catch (Exception e) { - e.printStackTrace(); - } - return out; - } - -} \ No newline at end of file + public static TrueTypeFont loadSystemFont(String name, float defSize, boolean antialias, int type) { + Font font; + TrueTypeFont out = null; + try { + font = new Font(name, type, (int) defSize); + font = font.deriveFont(defSize); + out = new TrueTypeFont(font, antialias); + } catch (Exception e) { + e.printStackTrace(); + } + return out; + } + + public static TrueTypeFont createFont(ResourceLocation res, float defSize, boolean antialias) { + return createFont(res, defSize, antialias, Font.TRUETYPE_FONT); + } + + public static TrueTypeFont createFont(ResourceLocation res, float defSize, boolean antialias, int type) { + Font font; + TrueTypeFont out = null; + try { + font = Font + .createFont(type, Minecraft.getMinecraft().getResourceManager().getResource(res).getInputStream()); + font = font.deriveFont(defSize); + out = new TrueTypeFont(font, antialias); + } catch (Exception e) { + e.printStackTrace(); + } + return out; + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java b/src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java index 2c20a42..ab619da 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java @@ -1,86 +1,82 @@ package mcp.mobius.waila.gui.truetyper; /** -* TrueTyper: Open Source TTF implementation for Minecraft. -* Copyright (C) 2013 - Mr_okushama -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * TrueTyper: Open Source TTF implementation for Minecraft. Copyright (C) 2013 - Mr_okushama + * + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later + * version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. If not, see + * . + */ public class Formatter { - - public static float[] getFormatted(char c){ - int[] outrgba = null; - float[] outfloat; - switch(c){ - case '0': - outrgba = new int[]{0,0,0,0,255}; - break; - case '1': - outrgba = new int[]{0,0,170,255}; - break; - case '2': - outrgba = new int[]{0,170,0,255}; - break; - case '3': - outrgba = new int[]{0,170,170,255}; - break; - case '4': - outrgba = new int[]{170,0,0,255}; - break; - case '5': - outrgba = new int[]{170,0,170,255}; - break; - case '6': - outrgba = new int[]{255,170,0,255}; - break; - case '7': - outrgba = new int[]{170,170,170,255}; - break; - case '8': - outrgba = new int[]{85,85,85,255}; - break; - case '9': - outrgba = new int[]{85,85,255,255}; - break; - case 'a': - outrgba = new int[]{85,255,85,255}; - break; - case 'b': - outrgba = new int[]{85,255,255,255}; - break; - case 'c': - outrgba = new int[]{255,85,85,255}; - break; - case 'd': - outrgba = new int[]{85,255,255,255}; - break; - case 'e': - outrgba = new int[]{255,255,85,255}; - break; - case 'f': - outrgba = new int[]{255,255,255,255}; - break; - default: - outrgba = new int[]{255,255,255,255}; - break; - } - outfloat = new float[outrgba.length]; - for(int i = 0; i < outrgba.length ; i++){ - outfloat[i] = outrgba[i] > 0 ? outrgba[i]/255 : 0; - } - return outfloat; - } + + public static float[] getFormatted(char c) { + int[] outrgba = null; + float[] outfloat; + switch (c) { + case '0': + outrgba = new int[] { 0, 0, 0, 0, 255 }; + break; + case '1': + outrgba = new int[] { 0, 0, 170, 255 }; + break; + case '2': + outrgba = new int[] { 0, 170, 0, 255 }; + break; + case '3': + outrgba = new int[] { 0, 170, 170, 255 }; + break; + case '4': + outrgba = new int[] { 170, 0, 0, 255 }; + break; + case '5': + outrgba = new int[] { 170, 0, 170, 255 }; + break; + case '6': + outrgba = new int[] { 255, 170, 0, 255 }; + break; + case '7': + outrgba = new int[] { 170, 170, 170, 255 }; + break; + case '8': + outrgba = new int[] { 85, 85, 85, 255 }; + break; + case '9': + outrgba = new int[] { 85, 85, 255, 255 }; + break; + case 'a': + outrgba = new int[] { 85, 255, 85, 255 }; + break; + case 'b': + outrgba = new int[] { 85, 255, 255, 255 }; + break; + case 'c': + outrgba = new int[] { 255, 85, 85, 255 }; + break; + case 'd': + outrgba = new int[] { 85, 255, 255, 255 }; + break; + case 'e': + outrgba = new int[] { 255, 255, 85, 255 }; + break; + case 'f': + outrgba = new int[] { 255, 255, 255, 255 }; + break; + default: + outrgba = new int[] { 255, 255, 255, 255 }; + break; + } + outfloat = new float[outrgba.length]; + for (int i = 0; i < outrgba.length; i++) { + outfloat[i] = outrgba[i] > 0 ? outrgba[i] / 255 : 0; + } + return outfloat; + } } diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java b/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java index dbb3b17..cb02782 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java @@ -1,71 +1,38 @@ package mcp.mobius.waila.gui.truetyper; /** -* TrueTyper: Open Source TTF implementation for Minecraft. -* Copyright (C) 2013 - Mr_okushama -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ + * TrueTyper: Open Source TTF implementation for Minecraft. Copyright (C) 2013 - Mr_okushama + * + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later + * version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. If not, see + * . + */ -import java.awt.Font; -import java.awt.GraphicsEnvironment; import java.util.ArrayList; -import net.minecraft.util.EnumChatFormatting; - public class Test { - public static ArrayList testFonts = new ArrayList(); - public static float[] white = {1f,1f,1f,1f}; - public static boolean init = false; - public static void initTest(){ - return; - /* - GraphicsEnvironment e = GraphicsEnvironment.getLocalGraphicsEnvironment(); - Font[] fonts = e.getAllFonts(); - { - int max = 9; - for(Font f : fonts){ - boolean pass = true; - for(TrueTypeFont ttf : testFonts){ - if(ttf.font.getFontName().startsWith(f.getFontName().substring(0, 1))){ - pass = false; - continue; - } - } - if(pass){ - max--; - if(max == 0){ - break; - } - testFonts.add(FontLoader.loadSystemFont(f.getFontName(), 24f, false)); - testFonts.add(FontLoader.loadSystemFont(f.getFontName(), 24f, true)); - } - } - } - init = true; - - } - - public static void doTest(){ - if(!init){ - initTest(); - } - for(int i =0; i < testFonts.size(); i++){ - int y = 10+i*12; - int x = 10; - FontHelper.drawString("He"+EnumChatFormatting.GOLD+"llo "+EnumChatFormatting.GREEN+"wor"+EnumChatFormatting.YELLOW+"ld", x, y, testFonts.get(i), 1f, 1f); - }*/ - } + public static ArrayList testFonts = new ArrayList(); + public static float[] white = { 1f, 1f, 1f, 1f }; + public static boolean init = false; + + public static void initTest() { + return; + /* + * GraphicsEnvironment e = GraphicsEnvironment.getLocalGraphicsEnvironment(); Font[] fonts = e.getAllFonts(); { + * int max = 9; for(Font f : fonts){ boolean pass = true; for(TrueTypeFont ttf : testFonts){ + * if(ttf.font.getFontName().startsWith(f.getFontName().substring(0, 1))){ pass = false; continue; } } if(pass){ + * max--; if(max == 0){ break; } testFonts.add(FontLoader.loadSystemFont(f.getFontName(), 24f, false)); + * testFonts.add(FontLoader.loadSystemFont(f.getFontName(), 24f, true)); } } } init = true; } public static void + * doTest(){ if(!init){ initTest(); } for(int i =0; i < testFonts.size(); i++){ int y = 10+i*12; int x = 10; + * FontHelper.drawString("He"+EnumChatFormatting.GOLD+"llo "+EnumChatFormatting.GREEN+"wor"+EnumChatFormatting. + * YELLOW+"ld", x, y, testFonts.get(i), 1f, 1f); } + */ + } } diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java b/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java index c67ddee..a2ca4ae 100644 --- a/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java @@ -4,6 +4,7 @@ import java.awt.Color; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics2D; +import java.awt.GraphicsEnvironment; import java.awt.RenderingHints; import java.awt.image.BufferedImage; import java.awt.image.DataBuffer; @@ -14,493 +15,477 @@ import java.nio.ByteOrder; import java.nio.IntBuffer; import java.util.HashMap; import java.util.Map; -import java.awt.GraphicsEnvironment; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.settings.GameSettings; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.lwjgl.opengl.GL30; import org.lwjgl.util.glu.GLU; - /** -* TrueTyper: Open Source TTF implementation for Minecraft. -* Modified from Slick2D - under BSD Licensing - http://slick.ninjacave.com/license/ -* -* Copyright (c) 2013 - Slick2D -* -* All rights reserved. -*/ + * TrueTyper: Open Source TTF implementation for Minecraft. Modified from Slick2D - under BSD Licensing - + * http://slick.ninjacave.com/license/ + * + * Copyright (c) 2013 - Slick2D + * + * All rights reserved. + */ public class TrueTypeFont { - public final static int - ALIGN_LEFT = 0, - ALIGN_RIGHT = 1, - ALIGN_CENTER = 2; - /** Array that holds necessary information about the font characters */ - private FloatObject[] charArray = new FloatObject[256]; - - /** Map of user defined font characters (Character <-> IntObject) */ - private Map customChars = new HashMap(); - /** Boolean flag on whether AntiAliasing is enabled or not */ - protected boolean antiAlias; + public final static int ALIGN_LEFT = 0, ALIGN_RIGHT = 1, ALIGN_CENTER = 2; + /** Array that holds necessary information about the font characters */ + private FloatObject[] charArray = new FloatObject[256]; - /** Font's size */ - private float fontSize = 0; + /** Map of user defined font characters (Character <-> IntObject) */ + private Map customChars = new HashMap(); - /** Font's height */ - private float fontHeight = 0; + /** Boolean flag on whether AntiAliasing is enabled or not */ + protected boolean antiAlias; - /** Texture used to cache the font 0-255 characters */ - private int fontTextureID; - - /** Default font texture width */ - private int textureWidth = 1024; + /** Font's size */ + private float fontSize = 0; - /** Default font texture height */ - private int textureHeight = 1024; + /** Font's height */ + private float fontHeight = 0; - /** A reference to Java's AWT Font that we create our font texture from */ - protected Font font; + /** Texture used to cache the font 0-255 characters */ + private int fontTextureID; - /** The font metrics for our Java AWT font */ - private FontMetrics fontMetrics; + /** Default font texture width */ + private int textureWidth = 1024; - - private int correctL = 9, correctR = 8; - - private class FloatObject { - /** Character's width */ - public float width; + /** Default font texture height */ + private int textureHeight = 1024; - /** Character's height */ - public float height; + /** A reference to Java's AWT Font that we create our font texture from */ + protected Font font; - /** Character's stored x position */ - public float storedX; + /** The font metrics for our Java AWT font */ + private FontMetrics fontMetrics; - /** Character's stored y position */ - public float storedY; - } + private int correctL = 9, correctR = 8; + private class FloatObject { - public TrueTypeFont(Font font, boolean antiAlias, char[] additionalChars) { - this.font = font; - this.fontSize = font.getSize()+3; - this.antiAlias = antiAlias; + /** Character's width */ + public float width; - createSet( additionalChars ); - System.out.println("TrueTypeFont loaded: "+font+" - AntiAlias = "+antiAlias); - fontHeight -= 1; - if (fontHeight <= 0) fontHeight = 1; - } + /** Character's height */ + public float height; - public TrueTypeFont(Font font, boolean antiAlias) { - this( font, antiAlias, null ); - } - public void setCorrection(boolean on) { - if (on) { - correctL = 2; - correctR = 1; - } else { - correctL = 0; - correctR = 0; - } - } - - private BufferedImage getFontImage(char ch) { - // Create a temporary image to extract the character's size - BufferedImage tempfontImage = new BufferedImage(1, 1, - BufferedImage.TYPE_INT_ARGB); - Graphics2D g = (Graphics2D) tempfontImage.getGraphics(); - if (antiAlias == true) { - g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - } - g.setFont(font); - fontMetrics = g.getFontMetrics(); - float charwidth = fontMetrics.charWidth(ch)+8; + /** Character's stored x position */ + public float storedX; - if (charwidth <= 0) { - charwidth = 7; - } - float charheight = fontMetrics.getHeight()+3; - if (charheight <= 0) { - charheight = fontSize; - } + /** Character's stored y position */ + public float storedY; + } - // Create another image holding the character we are creating - BufferedImage fontImage; - fontImage = new BufferedImage((int)charwidth,(int)charheight, - BufferedImage.TYPE_INT_ARGB); - Graphics2D gt = (Graphics2D) fontImage.getGraphics(); - if (antiAlias == true) { - gt.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - } - gt.setFont(font); + public TrueTypeFont(Font font, boolean antiAlias, char[] additionalChars) { + this.font = font; + this.fontSize = font.getSize() + 3; + this.antiAlias = antiAlias; - gt.setColor(Color.WHITE); - int charx = 3; - int chary = 1; - gt.drawString(String.valueOf(ch), (charx), (chary) - + fontMetrics.getAscent()); + createSet(additionalChars); + System.out.println("TrueTypeFont loaded: " + font + " - AntiAlias = " + antiAlias); + fontHeight -= 1; + if (fontHeight <= 0) fontHeight = 1; + } - return fontImage; + public TrueTypeFont(Font font, boolean antiAlias) { + this(font, antiAlias, null); + } - } + public void setCorrection(boolean on) { + if (on) { + correctL = 2; + correctR = 1; + } else { + correctL = 0; + correctR = 0; + } + } - private void createSet( char[] customCharsArray ) { - // If there are custom chars then I expand the font texture twice - if (customCharsArray != null && customCharsArray.length > 0) { - textureWidth *= 2; - } - - // In any case this should be done in other way. Texture with size 512x512 - // can maintain only 256 characters with resolution of 32x32. The texture - // size should be calculated dynamicaly by looking at character sizes. - - try { - - BufferedImage imgTemp = new BufferedImage(textureWidth, textureHeight, BufferedImage.TYPE_INT_ARGB); - Graphics2D g = (Graphics2D) imgTemp.getGraphics(); + private BufferedImage getFontImage(char ch) { + // Create a temporary image to extract the character's size + BufferedImage tempfontImage = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB); + Graphics2D g = (Graphics2D) tempfontImage.getGraphics(); + if (antiAlias == true) { + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + } + g.setFont(font); + fontMetrics = g.getFontMetrics(); + float charwidth = fontMetrics.charWidth(ch) + 8; - g.setColor(new Color(0,0,0,1)); - g.fillRect(0,0,textureWidth,textureHeight); - - float rowHeight = 0; - float positionX = 0; - float positionY = 0; - - int customCharsLength = ( customCharsArray != null ) ? customCharsArray.length : 0; + if (charwidth <= 0) { + charwidth = 7; + } + float charheight = fontMetrics.getHeight() + 3; + if (charheight <= 0) { + charheight = fontSize; + } - for (int i = 0; i < 256 + customCharsLength; i++) { - - // get 0-255 characters and then custom characters - char ch = ( i < 256 ) ? (char) i : customCharsArray[i-256]; - - BufferedImage fontImage = getFontImage(ch); + // Create another image holding the character we are creating + BufferedImage fontImage; + fontImage = new BufferedImage((int) charwidth, (int) charheight, BufferedImage.TYPE_INT_ARGB); + Graphics2D gt = (Graphics2D) fontImage.getGraphics(); + if (antiAlias == true) { + gt.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + } + gt.setFont(font); - FloatObject newIntObject = new FloatObject(); + gt.setColor(Color.WHITE); + int charx = 3; + int chary = 1; + gt.drawString(String.valueOf(ch), (charx), (chary) + fontMetrics.getAscent()); - newIntObject.width = fontImage.getWidth(); - newIntObject.height = fontImage.getHeight(); + return fontImage; - if (positionX + newIntObject.width >= textureWidth) { - positionX = 0; - positionY += rowHeight; - rowHeight = 0; - } + } - newIntObject.storedX = positionX; - newIntObject.storedY = positionY; + private void createSet(char[] customCharsArray) { + // If there are custom chars then I expand the font texture twice + if (customCharsArray != null && customCharsArray.length > 0) { + textureWidth *= 2; + } - if (newIntObject.height > fontHeight) { - fontHeight = newIntObject.height; - } + // In any case this should be done in other way. Texture with size 512x512 + // can maintain only 256 characters with resolution of 32x32. The texture + // size should be calculated dynamicaly by looking at character sizes. - if (newIntObject.height > rowHeight) { - rowHeight = newIntObject.height; - } + try { - // Draw it here - g.drawImage(fontImage, (int)positionX, (int)positionY, null); + BufferedImage imgTemp = new BufferedImage(textureWidth, textureHeight, BufferedImage.TYPE_INT_ARGB); + Graphics2D g = (Graphics2D) imgTemp.getGraphics(); - positionX += newIntObject.width; + g.setColor(new Color(0, 0, 0, 1)); + g.fillRect(0, 0, textureWidth, textureHeight); - if( i < 256 ) { // standard characters - charArray[i] = newIntObject; - } else { // custom characters - customChars.put( new Character( ch ), newIntObject ); - } + float rowHeight = 0; + float positionX = 0; + float positionY = 0; - fontImage = null; - } + int customCharsLength = (customCharsArray != null) ? customCharsArray.length : 0; - fontTextureID = loadImage(imgTemp); - + for (int i = 0; i < 256 + customCharsLength; i++) { + // get 0-255 characters and then custom characters + char ch = (i < 256) ? (char) i : customCharsArray[i - 256]; - //.getTexture(font.toString(), imgTemp); + BufferedImage fontImage = getFontImage(ch); - } catch (Exception e) { - System.err.println("Failed to create font."); - e.printStackTrace(); - } - } - - private void drawQuad(float drawX, float drawY, float drawX2, float drawY2, - float srcX, float srcY, float srcX2, float srcY2) { - float DrawWidth = drawX2 - drawX; - float DrawHeight = drawY2 - drawY; - float TextureSrcX= srcX / textureWidth; - float TextureSrcY = srcY / textureHeight; - float SrcWidth = srcX2 - srcX; - float SrcHeight = srcY2 - srcY; - float RenderWidth = (SrcWidth / textureWidth); - float RenderHeight = (SrcHeight / textureHeight); - Tessellator t = Tessellator.instance; - - //t.setColorRGBA_F(0f, 0f, 0f, 1f); - - t.addVertexWithUV(drawX, drawY, 0, TextureSrcX, TextureSrcY); - //GL11.glTexCoord2f(TextureSrcX, TextureSrcY); - //GL11.glVertex2f(drawX, drawY); - - t.addVertexWithUV(drawX, drawY + DrawHeight, 0, TextureSrcX, TextureSrcY + RenderHeight); - //GL11.glTexCoord2f(TextureSrcX, TextureSrcY + RenderHeight); - //GL11.glVertex2f(drawX, drawY + DrawHeight); - - t.addVertexWithUV(drawX + DrawWidth, drawY + DrawHeight, 0, TextureSrcX + RenderWidth, TextureSrcY + RenderHeight); - //GL11.glTexCoord2f(TextureSrcX + RenderWidth, TextureSrcY + RenderHeight); - //GL11.glVertex2f(drawX + DrawWidth, drawY + DrawHeight); - - t.addVertexWithUV(drawX + DrawWidth, drawY, 0, TextureSrcX + RenderWidth, TextureSrcY); - //GL11.glTexCoord2f(TextureSrcX + RenderWidth, TextureSrcY); - //GL11.glVertex2f(drawX + DrawWidth, drawY); - } + FloatObject newIntObject = new FloatObject(); - public float getWidth(String whatchars) { - float totalwidth = 0; - FloatObject floatObject = null; - int currentChar = 0; - float lastWidth = -10f; - for (int i = 0; i < whatchars.length(); i++) { - currentChar = whatchars.charAt(i); - if (currentChar < 256) { - floatObject = charArray[currentChar]; - } else { - floatObject = (FloatObject)customChars.get( new Character( (char) currentChar ) ); - } - - if( floatObject != null ){ - totalwidth += floatObject.width/2; - lastWidth = floatObject.width; - } - } - //System.out.println("Size: "+totalwidth); - return this.fontMetrics.stringWidth(whatchars); - //return (totalwidth); - } + newIntObject.width = fontImage.getWidth(); + newIntObject.height = fontImage.getHeight(); - public float getHeight() { - return fontHeight; - } + if (positionX + newIntObject.width >= textureWidth) { + positionX = 0; + positionY += rowHeight; + rowHeight = 0; + } + newIntObject.storedX = positionX; + newIntObject.storedY = positionY; - public float getHeight(String HeightString) { - return fontHeight; - } + if (newIntObject.height > fontHeight) { + fontHeight = newIntObject.height; + } - public float getLineHeight() { - return fontHeight; - } + if (newIntObject.height > rowHeight) { + rowHeight = newIntObject.height; + } - public void drawString(float x, float y, String whatchars, float scaleX, float scaleY, float... rgba) { - if(rgba.length == 0) rgba = new float[]{1f,1f,1f,1f}; - drawString(x,y,whatchars, 0, whatchars.length()-1, scaleX, scaleY, ALIGN_LEFT, rgba); - } - public void drawString(float x, float y, String whatchars, float scaleX, float scaleY, int format, float... rgba) { - if(rgba.length == 0) rgba = new float[]{1f,1f,1f,1f}; + // Draw it here + g.drawImage(fontImage, (int) positionX, (int) positionY, null); - drawString(x,y,whatchars, 0, whatchars.length()-1, scaleX, scaleY, format, rgba); - } + positionX += newIntObject.width; + if (i < 256) { // standard characters + charArray[i] = newIntObject; + } else { // custom characters + customChars.put(new Character(ch), newIntObject); + } - public void drawString(float x, float y, String whatchars, int startIndex, int endIndex, float scaleX, float scaleY, int format, float... rgba) { - if(rgba.length == 0) rgba = new float[]{1f,1f,1f,1f}; - GL11.glPushMatrix(); - GL11.glScalef (scaleX, scaleY, 1.0f); - - FloatObject floatObject = null; - int charCurrent; - + fontImage = null; + } - float totalwidth = 0; - int i = startIndex, d, c; - float startY = 0; + fontTextureID = loadImage(imgTemp); + // .getTexture(font.toString(), imgTemp); - - switch (format) { - case ALIGN_RIGHT: { - d = -1; - c = correctR; - - while (i < endIndex) { - if (whatchars.charAt(i) == '\n') startY -= fontHeight; - i++; - } - break; - } - case ALIGN_CENTER: { - for (int l = startIndex; l <= endIndex; l++) { - charCurrent = whatchars.charAt(l); - if (charCurrent == '\n') break; - if (charCurrent < 256) { - floatObject = charArray[charCurrent]; - } else { - floatObject = (FloatObject)customChars.get( new Character( (char) charCurrent ) ); - } - totalwidth += floatObject.width-correctL; - } - totalwidth /= -2; - } - case ALIGN_LEFT: - default: { - d = 1; - c = correctL; - break; - } - - } - GL11.glBindTexture(GL11.GL_TEXTURE_2D, fontTextureID); - Tessellator t = Tessellator.instance; - t.startDrawingQuads(); - // GL11.glBegin(GL11.GL_QUADS); - if(rgba.length == 4) - t.setColorRGBA_F(rgba[0], rgba[1], rgba[2], rgba[3]); - while (i >= startIndex && i <= endIndex) { - - charCurrent = whatchars.charAt(i); - if (charCurrent < 256) { - floatObject = charArray[charCurrent]; - } else { - floatObject = (FloatObject)customChars.get( new Character( (char) charCurrent ) ); - } - - if( floatObject != null ) { - if (d < 0) totalwidth += (floatObject.width-c) * d; - if (charCurrent == '\n') { - startY -= fontHeight * d; - totalwidth = 0; - if (format == ALIGN_CENTER) { - for (int l = i+1; l <= endIndex; l++) { - charCurrent = whatchars.charAt(l); - if (charCurrent == '\n') break; - if (charCurrent < 256) { - floatObject = charArray[charCurrent]; - } else { - floatObject = (FloatObject)customChars.get( new Character( (char) charCurrent ) ); - } - totalwidth += floatObject.width-correctL; - } - totalwidth /= -2; - } - //if center get next lines total width/2; - } - else { - drawQuad((totalwidth + floatObject.width) + x/scaleX, - startY + y/scaleY, - totalwidth + x/scaleX, - (startY + floatObject.height) + y/scaleY, - floatObject.storedX + floatObject.width, - floatObject.storedY + floatObject.height, - floatObject.storedX, - floatObject.storedY); - if (d > 0) totalwidth += (floatObject.width-c) * d ; - } - i += d; - - } - } - t.draw(); - // GL11.glEnd(); - - GL11.glPopMatrix(); - } - public static int loadImage(BufferedImage bufferedImage) { - try { - short width = (short)bufferedImage.getWidth(); - short height = (short)bufferedImage.getHeight(); - //textureLoader.bpp = bufferedImage.getColorModel().hasAlpha() ? (byte)32 : (byte)24; - int bpp = (byte)bufferedImage.getColorModel().getPixelSize(); - ByteBuffer byteBuffer; - DataBuffer db = bufferedImage.getData().getDataBuffer(); - if (db instanceof DataBufferInt) { - int intI[] = ((DataBufferInt)(bufferedImage.getData().getDataBuffer())).getData(); - byte newI[] = new byte[intI.length * 4]; - for (int i = 0; i < intI.length; i++) { - byte b[] = intToByteArray(intI[i]); - int newIndex = i*4; - - newI[newIndex] = b[1]; - newI[newIndex+1] = b[2]; - newI[newIndex+2] = b[3]; - newI[newIndex+3] = b[0]; - } - - byteBuffer = ByteBuffer.allocateDirect( - width*height*(bpp/8)) - .order(ByteOrder.nativeOrder()) - .put(newI); - } else { - byteBuffer = ByteBuffer.allocateDirect( - width*height*(bpp/8)) - .order(ByteOrder.nativeOrder()) - .put(((DataBufferByte)(bufferedImage.getData().getDataBuffer())).getData()); - } - byteBuffer.flip(); - - - int internalFormat = GL11.GL_RGBA8, - format = GL11.GL_RGBA; - IntBuffer textureId = BufferUtils.createIntBuffer(1);; - GL11.glGenTextures(textureId); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, textureId.get(0)); - - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP); - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_CLAMP); - - - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST); - //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); - //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_NEAREST); - - //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_LINEAR); - //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST_MIPMAP_LINEAR); - //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST_MIPMAP_NEAREST); - - GL11.glTexEnvf(GL11.GL_TEXTURE_ENV, GL11.GL_TEXTURE_ENV_MODE, GL11.GL_MODULATE); + } catch (Exception e) { + System.err.println("Failed to create font."); + e.printStackTrace(); + } + } - GLU.gluBuild2DMipmaps(GL11.GL_TEXTURE_2D, internalFormat, width, height, format, GL11.GL_UNSIGNED_BYTE, byteBuffer); - return textureId.get(0); - - } catch (Exception e) { - throw new RuntimeException(e); - //System.exit(-1); - } - } - - public static boolean isSupported(String fontname) { - Font font[] = getFonts(); - for (int i = font.length-1; i >= 0; i--) { - if (font[i].getName().equalsIgnoreCase(fontname)) - return true; - } - return false; - } - public static Font[] getFonts() { - return GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts(); - } - public static byte[] intToByteArray(int value) { - return new byte[] { - (byte)(value >>> 24), - (byte)(value >>> 16), - (byte)(value >>> 8), - (byte)value}; - } - - public void destroy() { - IntBuffer scratch = BufferUtils.createIntBuffer(1); - scratch.put(0, fontTextureID); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0); - GL11.glDeleteTextures(scratch); - } -} \ No newline at end of file + private void drawQuad(float drawX, float drawY, float drawX2, float drawY2, float srcX, float srcY, float srcX2, + float srcY2) { + float DrawWidth = drawX2 - drawX; + float DrawHeight = drawY2 - drawY; + float TextureSrcX = srcX / textureWidth; + float TextureSrcY = srcY / textureHeight; + float SrcWidth = srcX2 - srcX; + float SrcHeight = srcY2 - srcY; + float RenderWidth = (SrcWidth / textureWidth); + float RenderHeight = (SrcHeight / textureHeight); + Tessellator t = Tessellator.instance; + + // t.setColorRGBA_F(0f, 0f, 0f, 1f); + + t.addVertexWithUV(drawX, drawY, 0, TextureSrcX, TextureSrcY); + // GL11.glTexCoord2f(TextureSrcX, TextureSrcY); + // GL11.glVertex2f(drawX, drawY); + + t.addVertexWithUV(drawX, drawY + DrawHeight, 0, TextureSrcX, TextureSrcY + RenderHeight); + // GL11.glTexCoord2f(TextureSrcX, TextureSrcY + RenderHeight); + // GL11.glVertex2f(drawX, drawY + DrawHeight); + + t.addVertexWithUV( + drawX + DrawWidth, + drawY + DrawHeight, + 0, + TextureSrcX + RenderWidth, + TextureSrcY + RenderHeight); + // GL11.glTexCoord2f(TextureSrcX + RenderWidth, TextureSrcY + RenderHeight); + // GL11.glVertex2f(drawX + DrawWidth, drawY + DrawHeight); + + t.addVertexWithUV(drawX + DrawWidth, drawY, 0, TextureSrcX + RenderWidth, TextureSrcY); + // GL11.glTexCoord2f(TextureSrcX + RenderWidth, TextureSrcY); + // GL11.glVertex2f(drawX + DrawWidth, drawY); + } + + public float getWidth(String whatchars) { + float totalwidth = 0; + FloatObject floatObject = null; + int currentChar = 0; + float lastWidth = -10f; + for (int i = 0; i < whatchars.length(); i++) { + currentChar = whatchars.charAt(i); + if (currentChar < 256) { + floatObject = charArray[currentChar]; + } else { + floatObject = (FloatObject) customChars.get(new Character((char) currentChar)); + } + + if (floatObject != null) { + totalwidth += floatObject.width / 2; + lastWidth = floatObject.width; + } + } + // System.out.println("Size: "+totalwidth); + return this.fontMetrics.stringWidth(whatchars); + // return (totalwidth); + } + + public float getHeight() { + return fontHeight; + } + + public float getHeight(String HeightString) { + return fontHeight; + } + + public float getLineHeight() { + return fontHeight; + } + + public void drawString(float x, float y, String whatchars, float scaleX, float scaleY, float... rgba) { + if (rgba.length == 0) rgba = new float[] { 1f, 1f, 1f, 1f }; + drawString(x, y, whatchars, 0, whatchars.length() - 1, scaleX, scaleY, ALIGN_LEFT, rgba); + } + + public void drawString(float x, float y, String whatchars, float scaleX, float scaleY, int format, float... rgba) { + if (rgba.length == 0) rgba = new float[] { 1f, 1f, 1f, 1f }; + + drawString(x, y, whatchars, 0, whatchars.length() - 1, scaleX, scaleY, format, rgba); + } + + public void drawString(float x, float y, String whatchars, int startIndex, int endIndex, float scaleX, float scaleY, + int format, float... rgba) { + if (rgba.length == 0) rgba = new float[] { 1f, 1f, 1f, 1f }; + GL11.glPushMatrix(); + GL11.glScalef(scaleX, scaleY, 1.0f); + + FloatObject floatObject = null; + int charCurrent; + + float totalwidth = 0; + int i = startIndex, d, c; + float startY = 0; + + switch (format) { + case ALIGN_RIGHT: { + d = -1; + c = correctR; + + while (i < endIndex) { + if (whatchars.charAt(i) == '\n') startY -= fontHeight; + i++; + } + break; + } + case ALIGN_CENTER: { + for (int l = startIndex; l <= endIndex; l++) { + charCurrent = whatchars.charAt(l); + if (charCurrent == '\n') break; + if (charCurrent < 256) { + floatObject = charArray[charCurrent]; + } else { + floatObject = (FloatObject) customChars.get(new Character((char) charCurrent)); + } + totalwidth += floatObject.width - correctL; + } + totalwidth /= -2; + } + case ALIGN_LEFT: + default: { + d = 1; + c = correctL; + break; + } + + } + GL11.glBindTexture(GL11.GL_TEXTURE_2D, fontTextureID); + Tessellator t = Tessellator.instance; + t.startDrawingQuads(); + // GL11.glBegin(GL11.GL_QUADS); + if (rgba.length == 4) t.setColorRGBA_F(rgba[0], rgba[1], rgba[2], rgba[3]); + while (i >= startIndex && i <= endIndex) { + + charCurrent = whatchars.charAt(i); + if (charCurrent < 256) { + floatObject = charArray[charCurrent]; + } else { + floatObject = (FloatObject) customChars.get(new Character((char) charCurrent)); + } + + if (floatObject != null) { + if (d < 0) totalwidth += (floatObject.width - c) * d; + if (charCurrent == '\n') { + startY -= fontHeight * d; + totalwidth = 0; + if (format == ALIGN_CENTER) { + for (int l = i + 1; l <= endIndex; l++) { + charCurrent = whatchars.charAt(l); + if (charCurrent == '\n') break; + if (charCurrent < 256) { + floatObject = charArray[charCurrent]; + } else { + floatObject = (FloatObject) customChars.get(new Character((char) charCurrent)); + } + totalwidth += floatObject.width - correctL; + } + totalwidth /= -2; + } + // if center get next lines total width/2; + } else { + drawQuad( + (totalwidth + floatObject.width) + x / scaleX, + startY + y / scaleY, + totalwidth + x / scaleX, + (startY + floatObject.height) + y / scaleY, + floatObject.storedX + floatObject.width, + floatObject.storedY + floatObject.height, + floatObject.storedX, + floatObject.storedY); + if (d > 0) totalwidth += (floatObject.width - c) * d; + } + i += d; + + } + } + t.draw(); + // GL11.glEnd(); + + GL11.glPopMatrix(); + } + + public static int loadImage(BufferedImage bufferedImage) { + try { + short width = (short) bufferedImage.getWidth(); + short height = (short) bufferedImage.getHeight(); + // textureLoader.bpp = bufferedImage.getColorModel().hasAlpha() ? (byte)32 : (byte)24; + int bpp = (byte) bufferedImage.getColorModel().getPixelSize(); + ByteBuffer byteBuffer; + DataBuffer db = bufferedImage.getData().getDataBuffer(); + if (db instanceof DataBufferInt) { + int intI[] = ((DataBufferInt) (bufferedImage.getData().getDataBuffer())).getData(); + byte newI[] = new byte[intI.length * 4]; + for (int i = 0; i < intI.length; i++) { + byte b[] = intToByteArray(intI[i]); + int newIndex = i * 4; + + newI[newIndex] = b[1]; + newI[newIndex + 1] = b[2]; + newI[newIndex + 2] = b[3]; + newI[newIndex + 3] = b[0]; + } + + byteBuffer = ByteBuffer.allocateDirect(width * height * (bpp / 8)).order(ByteOrder.nativeOrder()) + .put(newI); + } else { + byteBuffer = ByteBuffer.allocateDirect(width * height * (bpp / 8)).order(ByteOrder.nativeOrder()) + .put(((DataBufferByte) (bufferedImage.getData().getDataBuffer())).getData()); + } + byteBuffer.flip(); + + int internalFormat = GL11.GL_RGBA8, format = GL11.GL_RGBA; + IntBuffer textureId = BufferUtils.createIntBuffer(1);; + GL11.glGenTextures(textureId); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, textureId.get(0)); + + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP); + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_CLAMP); + + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST); + // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); + // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_NEAREST); + + // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_LINEAR); + // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST_MIPMAP_LINEAR); + // GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST_MIPMAP_NEAREST); + + GL11.glTexEnvf(GL11.GL_TEXTURE_ENV, GL11.GL_TEXTURE_ENV_MODE, GL11.GL_MODULATE); + + GLU.gluBuild2DMipmaps( + GL11.GL_TEXTURE_2D, + internalFormat, + width, + height, + format, + GL11.GL_UNSIGNED_BYTE, + byteBuffer); + return textureId.get(0); + + } catch (Exception e) { + throw new RuntimeException(e); + // System.exit(-1); + } + } + + public static boolean isSupported(String fontname) { + Font font[] = getFonts(); + for (int i = font.length - 1; i >= 0; i--) { + if (font[i].getName().equalsIgnoreCase(fontname)) return true; + } + return false; + } + + public static Font[] getFonts() { + return GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts(); + } + + public static byte[] intToByteArray(int value) { + return new byte[] { (byte) (value >>> 24), (byte) (value >>> 16), (byte) (value >>> 8), (byte) value }; + } + + public void destroy() { + IntBuffer scratch = BufferUtils.createIntBuffer(1); + scratch.put(0, fontTextureID); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0); + GL11.glDeleteTextures(scratch); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java index bd76bfa..d84a602 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.gui.widgets; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.overlay.DisplayUtil; + import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; @@ -10,39 +11,39 @@ import org.lwjgl.util.Point; public class ItemStackDisplay extends WidgetBase { - ItemStack stack = null; - - public ItemStackDisplay(IWidget parent){ - this(parent, null); - } + ItemStack stack = null; + + public ItemStackDisplay(IWidget parent) { + this(parent, null); + } + + public ItemStackDisplay(IWidget parent, ItemStack stack) { + super(parent); + this.stack = stack; + this.setSize(16, 16); + } + + public void setStack(ItemStack stack) { + this.stack = stack; + } + + public ItemStack getStack() { + return this.stack; + } + + @Override + public void draw(Point pos) { + if (this.stack == null) return; + + float scaleX = this.getSize().getX() / 16.0f; + float scaleY = this.getSize().getY() / 16.0f; + + GL11.glPushMatrix(); + GL11.glScalef(scaleX, scaleY, 1.0f); - public ItemStackDisplay(IWidget parent, ItemStack stack){ - super(parent); - this.stack = stack; - this.setSize(16, 16); - } - - public void setStack(ItemStack stack){ - this.stack = stack; - } - - public ItemStack getStack(){ - return this.stack; - } - - @Override - public void draw(Point pos) { - if (this.stack == null) return; - - float scaleX = this.getSize().getX()/16.0f; - float scaleY = this.getSize().getY()/16.0f; - - GL11.glPushMatrix(); - GL11.glScalef(scaleX, scaleY, 1.0f); - RenderHelper.enableGUIStandardItemLighting(); - DisplayUtil.renderStack((int)(pos.getX()/scaleX), (int)(pos.getY()/scaleX), this.stack); - GL11.glPopMatrix(); - } + DisplayUtil.renderStack((int) (pos.getX() / scaleX), (int) (pos.getY() / scaleX), this.stack); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java index 42bd3d7..8c9acf0 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java @@ -1,60 +1,63 @@ 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; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.ResourceLocation; import org.lwjgl.util.Point; -import mcp.mobius.waila.cbcore.LangUtil; - public class LabelFixedFont extends WidgetBase { - protected String text = ""; - protected int color; + protected String text = ""; + protected int color; - public LabelFixedFont(IWidget parent, String text){ - super(parent); - this.setText(text); - this.color = 0xFFFFFF; - } - - public LabelFixedFont(IWidget parent, String text, int color){ - super(parent); - this.setText(text); - this.color = color; - } - - @Override - public IWidget setGeometry(WidgetGeometry geom){ - this.geom = geom; - this.updateGeometry(); - return this; - } - - public void setText(String text){ - this.text = LangUtil.translateG(text); - this.updateGeometry(); - } - - public void setColor(int color){ - this.color = color; - } - - private void updateGeometry(){ - if (this.geom == null) - this.geom = new WidgetGeometry(0,0,50,50, CType.ABSXY, CType.ABSXY); - - this.geom = new WidgetGeometry(this.geom.x, this.geom.y, this.mc.fontRenderer.getStringWidth(this.text), 8, this.geom.posType, CType.ABSXY, this.geom.alignX, this.geom.alignY); - } - - @Override - public void draw(Point pos) { - this.saveGLState(); - this.mc.fontRenderer.drawString(this.text, pos.getX(), pos.getY(), this.color); - //this.mc.fontRenderer.drawString(this.text, pos.getX(), pos.getY(), this.color); - this.loadGLState(); - } + public LabelFixedFont(IWidget parent, String text) { + super(parent); + this.setText(text); + this.color = 0xFFFFFF; + } + + public LabelFixedFont(IWidget parent, String text, int color) { + super(parent); + this.setText(text); + this.color = color; + } + + @Override + public IWidget setGeometry(WidgetGeometry geom) { + this.geom = geom; + this.updateGeometry(); + return this; + } + + public void setText(String text) { + this.text = LangUtil.translateG(text); + this.updateGeometry(); + } + + public void setColor(int color) { + this.color = color; + } + + private void updateGeometry() { + if (this.geom == null) this.geom = new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY); + + this.geom = new WidgetGeometry( + this.geom.x, + this.geom.y, + this.mc.fontRenderer.getStringWidth(this.text), + 8, + this.geom.posType, + CType.ABSXY, + this.geom.alignX, + this.geom.alignY); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + this.mc.fontRenderer.drawString(this.text, pos.getX(), pos.getY(), this.color); + // this.mc.fontRenderer.drawString(this.text, pos.getX(), pos.getY(), this.color); + this.loadGLState(); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java index 1573cc0..e833f61 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java @@ -1,6 +1,5 @@ package mcp.mobius.waila.gui.widgets; -import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; @@ -8,40 +7,37 @@ import org.lwjgl.util.Point; public class LayoutBase extends WidgetBase { - protected int bgcolor1 = 0x00000000; - protected int bgcolor2 = 0x00000000; - protected boolean renderBG; - - public LayoutBase(IWidget parent){ - super(parent); - } - - @Override - public void draw(Point pos) { - if (this.renderBG) - UIHelper.drawGradientRect(this.getLeft(), this.getTop(), this.getRight(), this.getBottom(), 0, this.bgcolor1, this.bgcolor2); - } + protected int bgcolor1 = 0x00000000; + protected int bgcolor2 = 0x00000000; + protected boolean renderBG; + + public LayoutBase(IWidget parent) { + super(parent); + } + + @Override + public void draw(Point pos) { + if (this.renderBG) UIHelper.drawGradientRect( + this.getLeft(), + this.getTop(), + this.getRight(), + this.getBottom(), + 0, + this.bgcolor1, + this.bgcolor2); + } + + public void setBackgroundColors(int bg1, int bg2) { + this.bgcolor1 = bg1; + this.bgcolor2 = bg2; + this.renderBG = true; + } + + /* + * @Override public void onMouseEnter(MouseEvent event) { IWidget widget = this.getWidgetAtCoordinates(event.x, + * event.y); if (widget != null && widget != this) widget.onMouseEnter(event); } + * @Override public void onMouseLeave(MouseEvent event) { IWidget widget = this.getWidgetAtCoordinates(event.x, + * event.y); if (widget != null && widget != this) widget.onMouseLeave(event); } + */ - public void setBackgroundColors(int bg1, int bg2){ - this.bgcolor1 = bg1; - this.bgcolor2 = bg2; - this.renderBG = true; - } - - /* - @Override - public void onMouseEnter(MouseEvent event) { - IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - if (widget != null && widget != this) - widget.onMouseEnter(event); - } - - @Override - public void onMouseLeave(MouseEvent event) { - IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - if (widget != null && widget != this) - widget.onMouseLeave(event); - } - */ - } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java index ce0c023..b74995c 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java @@ -1,122 +1,110 @@ package mcp.mobius.waila.gui.widgets; -import net.minecraft.client.gui.ScaledResolution; - -import org.lwjgl.input.Mouse; -import org.lwjgl.util.Point; - import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.events.MouseEvent.EventType; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.Signal; -public class LayoutCanvas extends LayoutBase{ +import net.minecraft.client.gui.ScaledResolution; - private MouseEvent lastMouseEvent; - private IWidget draggedWidget = null; - - public LayoutCanvas(){ - super(null); - this.setGeometry(0, 0, this.rez.getScaledWidth(), this.rez.getScaledHeight(), CType.ABSXY, CType.ABSXY); - Mouse.getDWheel(); // This is to "calibrate" the DWheel +import org.lwjgl.input.Mouse; +import org.lwjgl.util.Point; + +public class LayoutCanvas extends LayoutBase { + + private MouseEvent lastMouseEvent; + private IWidget draggedWidget = null; + + public LayoutCanvas() { + super(null); + this.setGeometry(0, 0, this.rez.getScaledWidth(), this.rez.getScaledHeight(), CType.ABSXY, CType.ABSXY); + Mouse.getDWheel(); // This is to "calibrate" the DWheel this.lastMouseEvent = new MouseEvent(this); - } - - @Override - public void draw(){ - this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - this.setGeometry(0, 0, this.rez.getScaledWidth(), this.rez.getScaledHeight(), CType.ABSXY, CType.ABSXY); - - /* - this.draw(this.getPos()); - - for (IWidget widget: this.widgets.values()) - if (widget.shouldRender()) - widget.draw(); - */ - - super.draw(); - - this.handleMouseInput(); - } - - @Override - public void draw(Point pos) { super.draw(pos); } - - @Override - public void handleMouseInput(){ - // Here we are going to generate the require mouse events we will pass down to all the other widgets - // This is more or less where the magic happens. If you want mouse support for a widget, it should be - // attached to a canvas like this one, or any inheriting one. - - MouseEvent event = new MouseEvent(this); - EventType type = event.getEventType(this.lastMouseEvent); - IWidget targetWidget = this.getWidgetAtCoordinates(event.x, event.y); - - switch (type){ - case CLICK: - if (targetWidget != null) - targetWidget.onMouseClick(event); - //this.onMouseClick(event); - break; - case DRAG: - if (targetWidget != null) - targetWidget.onMouseDrag(event); - //this.onMouseDrag(event); - break; - case MOVE: - if (targetWidget != null) - targetWidget.onMouseMove(event); - //this.onMouseMove(event); - break; - case RELEASED: - if (targetWidget != null) - targetWidget.onMouseRelease(event); - //this.onMouseRelease(event); - break; - case WHEEL: - if (targetWidget != null) - targetWidget.onMouseWheel(event); - //this.onMouseWheel(event); - break; - case ENTER: - if (event.trgwidget != null) - event.trgwidget.onMouseEnter(event); - if (this.lastMouseEvent.trgwidget != null){ - event.type = EventType.LEAVE; - this.lastMouseEvent.trgwidget.onMouseLeave(event); - } - break; - case NONE: - break; - default: - break; - } - - this.lastMouseEvent = event; - } + } @Override - public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params){ - if (signal == Signal.DRAGGED) - this.draggedWidget = srcwidget; - else - super.onWidgetEvent(srcwidget, signal, params); + public void draw() { + this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + this.setGeometry(0, 0, this.rez.getScaledWidth(), this.rez.getScaledHeight(), CType.ABSXY, CType.ABSXY); + + /* + * this.draw(this.getPos()); for (IWidget widget: this.widgets.values()) if (widget.shouldRender()) + * widget.draw(); + */ + + super.draw(); + + this.handleMouseInput(); } - + @Override - public void onMouseRelease(MouseEvent event){ - if(event.button == 0) - this.draggedWidget = null; - super.onMouseRelease(event); + public void draw(Point pos) { + super.draw(pos); } - + @Override - public void onMouseDrag(MouseEvent event){ - if (this.draggedWidget != null) - this.draggedWidget.onMouseDrag(event); - else - super.onMouseDrag(event); + public void handleMouseInput() { + // Here we are going to generate the require mouse events we will pass down to all the other widgets + // This is more or less where the magic happens. If you want mouse support for a widget, it should be + // attached to a canvas like this one, or any inheriting one. + + MouseEvent event = new MouseEvent(this); + EventType type = event.getEventType(this.lastMouseEvent); + IWidget targetWidget = this.getWidgetAtCoordinates(event.x, event.y); + + switch (type) { + case CLICK: + if (targetWidget != null) targetWidget.onMouseClick(event); + // this.onMouseClick(event); + break; + case DRAG: + if (targetWidget != null) targetWidget.onMouseDrag(event); + // this.onMouseDrag(event); + break; + case MOVE: + if (targetWidget != null) targetWidget.onMouseMove(event); + // this.onMouseMove(event); + break; + case RELEASED: + if (targetWidget != null) targetWidget.onMouseRelease(event); + // this.onMouseRelease(event); + break; + case WHEEL: + if (targetWidget != null) targetWidget.onMouseWheel(event); + // this.onMouseWheel(event); + break; + case ENTER: + if (event.trgwidget != null) event.trgwidget.onMouseEnter(event); + if (this.lastMouseEvent.trgwidget != null) { + event.type = EventType.LEAVE; + this.lastMouseEvent.trgwidget.onMouseLeave(event); + } + break; + case NONE: + break; + default: + break; + } + + this.lastMouseEvent = event; + } + + @Override + public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params) { + if (signal == Signal.DRAGGED) this.draggedWidget = srcwidget; + else super.onWidgetEvent(srcwidget, signal, params); + } + + @Override + public void onMouseRelease(MouseEvent event) { + if (event.button == 0) this.draggedWidget = null; + super.onMouseRelease(event); + } + + @Override + public void onMouseDrag(MouseEvent event) { + if (this.draggedWidget != null) this.draggedWidget.onMouseDrag(event); + else super.onMouseDrag(event); } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java index f4464f5..5c86c4f 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java @@ -1,6 +1,7 @@ package mcp.mobius.waila.gui.widgets; import mcp.mobius.waila.gui.interfaces.IWidget; + import net.minecraft.client.gui.ScaledResolution; import org.lwjgl.opengl.GL11; @@ -8,61 +9,60 @@ import org.lwjgl.util.Point; public class LayoutCropping extends LayoutBase { - int xOffset = 0; - int yOffset = 0; - - public LayoutCropping(IWidget parent){ - super(parent); - } + int xOffset = 0; + int yOffset = 0; - public void setOffsets(int xoffset, int yoffset){ - this.xOffset = xoffset; - this.yOffset = yoffset; - } - - @Override - public void draw(){ - this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - this.saveGLState(); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1.0f, 1.0f, 1.0f, this.alpha); - - this.draw(this.getPos()); - - GL11.glEnable(GL11.GL_SCISSOR_TEST); - GL11.glScissor(this.getPos().getX()*this.rez.getScaleFactor(), (this.rez.getScaledHeight() - (this.getPos().getY() + this.getSize().getY())) * this.rez.getScaleFactor(), this.getSize().getX()*this.rez.getScaleFactor(), this.getSize().getY()*this.rez.getScaleFactor()); - //GL11.glScissor(this.getPos().getX()*this.rez.getScaleFactor(), this.getPos().getY()*this.rez.getScaleFactor(), this.getSize().getX()*this.rez.getScaleFactor(), this.getSize().getY()*this.rez.getScaleFactor()); - - GL11.glTranslatef(xOffset, yOffset, 0.0f); - - /* - for (IWidget widget: this.widgets.values()) - if (widget.shouldRender()) - widget.draw(); - */ - + public LayoutCropping(IWidget parent) { + super(parent); + } - for (IWidget widget: this.renderQueue_LOW.values()) - if (widget.shouldRender()) - widget.draw(); + public void setOffsets(int xoffset, int yoffset) { + this.xOffset = xoffset; + this.yOffset = yoffset; + } - for (IWidget widget: this.renderQueue_MEDIUM.values()) - if (widget.shouldRender()) - widget.draw(); - - for (IWidget widget: this.renderQueue_HIGH.values()) - if (widget.shouldRender()) - widget.draw(); - + @Override + public void draw() { + this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + this.saveGLState(); - GL11.glDisable(GL11.GL_SCISSOR_TEST); - - this.loadGLState(); - } - - @Override - public void draw(Point pos) { super.draw(pos); } + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1.0f, 1.0f, 1.0f, this.alpha); + + this.draw(this.getPos()); + + GL11.glEnable(GL11.GL_SCISSOR_TEST); + GL11.glScissor( + this.getPos().getX() * this.rez.getScaleFactor(), + (this.rez.getScaledHeight() - (this.getPos().getY() + this.getSize().getY())) + * this.rez.getScaleFactor(), + this.getSize().getX() * this.rez.getScaleFactor(), + this.getSize().getY() * this.rez.getScaleFactor()); + // GL11.glScissor(this.getPos().getX()*this.rez.getScaleFactor(), + // this.getPos().getY()*this.rez.getScaleFactor(), this.getSize().getX()*this.rez.getScaleFactor(), + // this.getSize().getY()*this.rez.getScaleFactor()); + + GL11.glTranslatef(xOffset, yOffset, 0.0f); + + /* + * for (IWidget widget: this.widgets.values()) if (widget.shouldRender()) widget.draw(); + */ + + for (IWidget widget : this.renderQueue_LOW.values()) if (widget.shouldRender()) widget.draw(); + + for (IWidget widget : this.renderQueue_MEDIUM.values()) if (widget.shouldRender()) widget.draw(); + + for (IWidget widget : this.renderQueue_HIGH.values()) if (widget.shouldRender()) widget.draw(); + + GL11.glDisable(GL11.GL_SCISSOR_TEST); + + this.loadGLState(); + } + + @Override + public void draw(Point pos) { + super.draw(pos); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java index 1f93e7f..42f0e8e 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java @@ -8,36 +8,38 @@ import org.lwjgl.util.Point; public class LayoutMargin extends LayoutBase { - int left = 0; - int right = 0; - int top = 0; - int bottom = 0; - - public LayoutMargin(IWidget parent){ - super (parent); - this.setGeometry(new WidgetGeometry(0,0,0,0,CType.ABSXY,CType.ABSXY,WAlign.CENTER,WAlign.CENTER)); - } - - public void setMargins(int left, int right, int top, int bottom){ - this.left = left; - this.right = right; - this.top = top; - this.bottom = bottom; - } - - @Override - public Point getSize(){ - Point parentSize = this.parent.getSize(); - return new Point(parentSize.getX() - left - right, parentSize.getY() - top - bottom); - } + int left = 0; + int right = 0; + int top = 0; + int bottom = 0; - @Override - public Point getPos(){ - Point parentPos = this.parent.getPos(); - return new Point(parentPos.getX() + left, parentPos.getY() + top); - } - - @Override - public void draw(Point pos) { super.draw(pos); } + public LayoutMargin(IWidget parent) { + super(parent); + this.setGeometry(new WidgetGeometry(0, 0, 0, 0, CType.ABSXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } + + public void setMargins(int left, int right, int top, int bottom) { + this.left = left; + this.right = right; + this.top = top; + this.bottom = bottom; + } + + @Override + public Point getSize() { + Point parentSize = this.parent.getSize(); + return new Point(parentSize.getX() - left - right, parentSize.getY() - top - bottom); + } + + @Override + public Point getPos() { + Point parentPos = this.parent.getPos(); + return new Point(parentPos.getX() + left, parentPos.getY() + top); + } + + @Override + public void draw(Point pos) { + super.draw(pos); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java index 9faccc7..4925a71 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java @@ -2,7 +2,7 @@ package mcp.mobius.waila.gui.widgets; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; -import net.minecraft.client.renderer.Tessellator; + import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -10,22 +10,22 @@ import org.lwjgl.util.Point; public class PictureDisplay extends WidgetBase { - protected ResourceLocation texture; - - public PictureDisplay(IWidget parent, String uri){ - super(parent); - this.texture = new ResourceLocation(uri); - } - - @Override - public void draw(Point pos) { - this.saveGLState(); - - GL11.glPushMatrix(); - this.texManager.bindTexture(texture); - UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); - GL11.glPopMatrix(); + protected ResourceLocation texture; - this.loadGLState(); - } + public PictureDisplay(IWidget parent, String uri) { + super(parent); + this.texture = new ResourceLocation(uri); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + + GL11.glPushMatrix(); + this.texManager.bindTexture(texture); + UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); + GL11.glPopMatrix(); + + this.loadGLState(); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java index a8b87f5..ca6fb8b 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.gui.widgets; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; + import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -10,40 +11,40 @@ import org.lwjgl.util.Point; public class PictureSwitch extends WidgetBase { - private ResourceLocation texture1; - private ResourceLocation texture2; - private boolean mouseOver = false; - - public PictureSwitch(IWidget parent, String uri1, String uri2){ - super(parent); - this.texture1 = new ResourceLocation(uri1); - this.texture2 = new ResourceLocation(uri2); - } - - @Override - public void draw(Point pos) { - this.saveGLState(); - - ResourceLocation texture = mouseOver ? this.texture2 : this.texture1; - - GL11.glPushMatrix(); - this.texManager.bindTexture(texture); - UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); - GL11.glPopMatrix(); + private ResourceLocation texture1; + private ResourceLocation texture2; + private boolean mouseOver = false; - this.loadGLState(); - } - - @Override - public void onMouseEnter(MouseEvent event){ - //System.out.printf("%s %s\n", this, event); - mouseOver = true; - } + public PictureSwitch(IWidget parent, String uri1, String uri2) { + super(parent); + this.texture1 = new ResourceLocation(uri1); + this.texture2 = new ResourceLocation(uri2); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + + ResourceLocation texture = mouseOver ? this.texture2 : this.texture1; + + GL11.glPushMatrix(); + this.texManager.bindTexture(texture); + UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); + GL11.glPopMatrix(); + + this.loadGLState(); + } + + @Override + public void onMouseEnter(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + mouseOver = true; + } + + @Override + public void onMouseLeave(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + mouseOver = false; + } - @Override - public void onMouseLeave(MouseEvent event){ - //System.out.printf("%s %s\n", this, event); - mouseOver = false; - } - } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java index 9ac387a..2f83b37 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java @@ -7,195 +7,252 @@ import mcp.mobius.waila.gui.interfaces.WAlign; import org.lwjgl.util.Point; -public class ViewTable extends WidgetBase{ +public class ViewTable extends WidgetBase { - public class Cell extends WidgetBase{ - public Cell(IWidget parent, String text, WAlign align){ - super(parent); - - //this.addWidget("Crop", new LayoutCropping(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 100.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - - switch(align){ - case CENTER: - //this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) - this.addWidget("Text", new LabelFixedFont(null, text)) - .setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 100.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - break; - case LEFT: - //this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) - this.addWidget("Text", new LabelFixedFont(null, text)) - .setGeometry(new WidgetGeometry(5.0, 50.0, 95.0, 100.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.CENTER)); - break; - case RIGHT: - //this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) - this.addWidget("Text", new LabelFixedFont(null, text)) - .setGeometry(new WidgetGeometry(5.0, 50.0, 95.0, 100.0, CType.RELXY, CType.RELXY, WAlign.RIGHT, WAlign.CENTER)); - break; - default: - throw new UIException(String.format("Unexpected align value : %s", align)); - } - } - - @Override - public void draw(Point pos){} - } + public class Cell extends WidgetBase { - public class Row extends WidgetBase{ - int ncolumns = -1; - double[] widths; - String[] texts; - WAlign[] aligns; - boolean init = false; - int bgcolor1 = 0x50505050; - int bgcolor2 = 0x50505050; - - - public Row(IWidget parent){ - super(parent); - - this.addWidget("Background", new LayoutBase(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 100.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); - ((LayoutBase)this.getWidget("Background")).setBackgroundColors(this.bgcolor1, this.bgcolor2); - - } - - public Row setColumnsWidth(double... widths){ - if (this.ncolumns == -1) - this.ncolumns = widths.length; - else if(this.ncolumns != widths.length){ - throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, widths.length)); - } - - this.widths = widths; - - return this; - } - - public Row setColumnsText(String...strings ){ - if (this.ncolumns == -1) - this.ncolumns = strings.length; - else if(this.ncolumns != strings.length){ - throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, strings.length)); - } - - this.texts = strings; - - return this; - } - - public Row setColumnsAlign(WAlign... aligns ){ - if (this.ncolumns == -1) - this.ncolumns = aligns.length; - else if(this.ncolumns != aligns.length){ - throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, aligns.length)); - } - - this.aligns = aligns; - - return this; - } - - public Row setColors(int bg1, int bg2){ - this.bgcolor1 = bg1; - this.bgcolor2 = bg2; - ((LayoutBase)this.getWidget("Background")).setBackgroundColors(this.bgcolor1, this.bgcolor2); - return this; - } - - @Override - public void draw(){ - if (!init) - { - double currentOffset = 0.0; - for (int i = 0; i < this.ncolumns; i++){ - if (!this.widgets.containsKey(String.format("Cell_%02d", i))){ - Cell cell = (Cell)(this.addWidget(String.format("Cell_%02d", i), new Cell(null, this.texts[i], this.aligns[i]))); - cell.setGeometry(new WidgetGeometry(currentOffset, 50.0, this.widths[i], 100.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.CENTER)); - currentOffset += this.widths[i]; - } - } - init = true; - } - - super.draw(); - } - - @Override - public void draw(Point pos){} - } + public Cell(IWidget parent, String text, WAlign align) { + super(parent); - int ncolumns = -1; - int nrows = 0; - double[] widths; - String[] texts; - WAlign[] aligns; - boolean init = false; - - public ViewTable(IWidget parent){ - super(parent); - this.addWidget("Titles", new Row(null)).setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 16.0, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); - ((Row)this.getWidget("Titles")).setColors(0x00000000, 0x00000000); - this.addWidget("Viewport", new ViewportScrollable(null)).setGeometry(new WidgetGeometry(0.0, 16.0, 100.0, 90.0, CType.REL_X, CType.RELXY, WAlign.LEFT, WAlign.TOP)); - ((ViewportScrollable)(this.getWidget("Viewport"))).attachWidget(new LayoutBase(null)).setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 0.0, CType.RELXY, CType.REL_X, WAlign.LEFT, WAlign.TOP)); - - } - - @Override - public void draw(Point pos){} - - public ViewTable setColumnsWidth(double... widths){ - if (this.ncolumns == -1) - this.ncolumns = widths.length; - else if(this.ncolumns != widths.length){ - throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, widths.length)); - } - - this.widths = widths; - ((Row)this.getWidget("Titles")).setColumnsWidth(widths); - return this; - } - - public ViewTable setColumnsTitle(String...strings ){ - if (this.ncolumns == -1) - this.ncolumns = strings.length; - else if(this.ncolumns != strings.length){ - throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, strings.length)); - } - - this.texts = strings; - ((Row)this.getWidget("Titles")).setColumnsText(strings); - - return this; - } - - public ViewTable setColumnsAlign(WAlign... aligns ){ - if (this.ncolumns == -1) - this.ncolumns = aligns.length; - else if(this.ncolumns != aligns.length){ - throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, aligns.length)); - } - - this.aligns = aligns; - ((Row)this.getWidget("Titles")).setColumnsAlign(aligns); - - return this; - } - - public ViewTable addRow(String...strings ){ - IWidget tableLayout = ((ViewportScrollable)(this.getWidget("Viewport"))).getAttachedWidget(); - tableLayout.setSize(100.0, (this.nrows + 1) * 16); - - Row newRow = (Row)new Row(null); - newRow.setColumnsWidth(this.widths); - newRow.setColumnsText(strings); - newRow.setColumnsAlign(this.aligns); - if(this.nrows % 2 == 1) - newRow.setColors(0x50808080, 0x50808080); - newRow.setGeometry(new WidgetGeometry(0.0, 16*this.nrows, 100.0, 16, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); - - tableLayout.addWidget(String.format("Row_%03d", this.nrows), newRow); - - this.nrows += 1; - - return this; - } + // this.addWidget("Crop", new LayoutCropping(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 100.0, + // CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + + switch (align) { + case CENTER: + // this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) + this.addWidget("Text", new LabelFixedFont(null, text)).setGeometry( + new WidgetGeometry( + 50.0, + 50.0, + 100.0, + 100.0, + CType.RELXY, + CType.RELXY, + WAlign.CENTER, + WAlign.CENTER)); + break; + case LEFT: + // this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) + this.addWidget("Text", new LabelFixedFont(null, text)).setGeometry( + new WidgetGeometry( + 5.0, + 50.0, + 95.0, + 100.0, + CType.RELXY, + CType.RELXY, + WAlign.LEFT, + WAlign.CENTER)); + break; + case RIGHT: + // this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) + this.addWidget("Text", new LabelFixedFont(null, text)).setGeometry( + new WidgetGeometry( + 5.0, + 50.0, + 95.0, + 100.0, + CType.RELXY, + CType.RELXY, + WAlign.RIGHT, + WAlign.CENTER)); + break; + default: + throw new UIException(String.format("Unexpected align value : %s", align)); + } + } + + @Override + public void draw(Point pos) {} + } + + public class Row extends WidgetBase { + + int ncolumns = -1; + double[] widths; + String[] texts; + WAlign[] aligns; + boolean init = false; + int bgcolor1 = 0x50505050; + int bgcolor2 = 0x50505050; + + public Row(IWidget parent) { + super(parent); + + this.addWidget("Background", new LayoutBase(null)).setGeometry( + new WidgetGeometry( + 50.0, + 50.0, + 100.0, + 100.0, + CType.RELXY, + CType.RELXY, + WAlign.CENTER, + WAlign.CENTER)); + ((LayoutBase) this.getWidget("Background")).setBackgroundColors(this.bgcolor1, this.bgcolor2); + + } + + public Row setColumnsWidth(double... widths) { + if (this.ncolumns == -1) this.ncolumns = widths.length; + else if (this.ncolumns != widths.length) { + throw new UIException( + String.format( + "Number of columns mismatch. Expecting %d, got %d", + this.ncolumns, + widths.length)); + } + + this.widths = widths; + + return this; + } + + public Row setColumnsText(String... strings) { + if (this.ncolumns == -1) this.ncolumns = strings.length; + else if (this.ncolumns != strings.length) { + throw new UIException( + String.format( + "Number of columns mismatch. Expecting %d, got %d", + this.ncolumns, + strings.length)); + } + + this.texts = strings; + + return this; + } + + public Row setColumnsAlign(WAlign... aligns) { + if (this.ncolumns == -1) this.ncolumns = aligns.length; + else if (this.ncolumns != aligns.length) { + throw new UIException( + String.format( + "Number of columns mismatch. Expecting %d, got %d", + this.ncolumns, + aligns.length)); + } + + this.aligns = aligns; + + return this; + } + + public Row setColors(int bg1, int bg2) { + this.bgcolor1 = bg1; + this.bgcolor2 = bg2; + ((LayoutBase) this.getWidget("Background")).setBackgroundColors(this.bgcolor1, this.bgcolor2); + return this; + } + + @Override + public void draw() { + if (!init) { + double currentOffset = 0.0; + for (int i = 0; i < this.ncolumns; i++) { + if (!this.widgets.containsKey(String.format("Cell_%02d", i))) { + Cell cell = (Cell) (this.addWidget( + String.format("Cell_%02d", i), + new Cell(null, this.texts[i], this.aligns[i]))); + cell.setGeometry( + new WidgetGeometry( + currentOffset, + 50.0, + this.widths[i], + 100.0, + CType.RELXY, + CType.RELXY, + WAlign.LEFT, + WAlign.CENTER)); + currentOffset += this.widths[i]; + } + } + init = true; + } + + super.draw(); + } + + @Override + public void draw(Point pos) {} + } + + int ncolumns = -1; + int nrows = 0; + double[] widths; + String[] texts; + WAlign[] aligns; + boolean init = false; + + public ViewTable(IWidget parent) { + super(parent); + this.addWidget("Titles", new Row(null)).setGeometry( + new WidgetGeometry(0.0, 0.0, 100.0, 16.0, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + ((Row) this.getWidget("Titles")).setColors(0x00000000, 0x00000000); + this.addWidget("Viewport", new ViewportScrollable(null)).setGeometry( + new WidgetGeometry(0.0, 16.0, 100.0, 90.0, CType.REL_X, CType.RELXY, WAlign.LEFT, WAlign.TOP)); + ((ViewportScrollable) (this.getWidget("Viewport"))).attachWidget(new LayoutBase(null)).setGeometry( + new WidgetGeometry(0.0, 0.0, 100.0, 0.0, CType.RELXY, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + + } + + @Override + public void draw(Point pos) {} + + public ViewTable setColumnsWidth(double... widths) { + if (this.ncolumns == -1) this.ncolumns = widths.length; + else if (this.ncolumns != widths.length) { + throw new UIException( + String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, widths.length)); + } + + this.widths = widths; + ((Row) this.getWidget("Titles")).setColumnsWidth(widths); + return this; + } + + public ViewTable setColumnsTitle(String... strings) { + if (this.ncolumns == -1) this.ncolumns = strings.length; + else if (this.ncolumns != strings.length) { + throw new UIException( + String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, strings.length)); + } + + this.texts = strings; + ((Row) this.getWidget("Titles")).setColumnsText(strings); + + return this; + } + + public ViewTable setColumnsAlign(WAlign... aligns) { + if (this.ncolumns == -1) this.ncolumns = aligns.length; + else if (this.ncolumns != aligns.length) { + throw new UIException( + String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, aligns.length)); + } + + this.aligns = aligns; + ((Row) this.getWidget("Titles")).setColumnsAlign(aligns); + + return this; + } + + public ViewTable addRow(String... strings) { + IWidget tableLayout = ((ViewportScrollable) (this.getWidget("Viewport"))).getAttachedWidget(); + tableLayout.setSize(100.0, (this.nrows + 1) * 16); + + Row newRow = (Row) new Row(null); + newRow.setColumnsWidth(this.widths); + newRow.setColumnsText(strings); + newRow.setColumnsAlign(this.aligns); + if (this.nrows % 2 == 1) newRow.setColors(0x50808080, 0x50808080); + newRow.setGeometry( + new WidgetGeometry(0.0, 16 * this.nrows, 100.0, 16, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + + tableLayout.addWidget(String.format("Row_%03d", this.nrows), newRow); + + this.nrows += 1; + + return this; + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java index 247c3e7..cc3e4e2 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java @@ -7,173 +7,180 @@ import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.Signal; import mcp.mobius.waila.gui.interfaces.WAlign; -import org.lwjgl.opengl.Display; import org.lwjgl.util.Point; public class ViewportScrollable extends WidgetBase { - public class Escalator extends WidgetBase{ - int yOffset = 0; - int sizeCursor = 8; - int maxValue = 0; - int step = 0; - boolean drag = false; - - public Escalator(IWidget parent, int step){ - this.parent = parent; - this.step = step; - } + public class Escalator extends WidgetBase { - public void setOffset(int yoffset){ - this.yOffset = yoffset; - } - - public void setMaxValue(int value){ - this.maxValue = value; - } - - public void setStep(int step){ - this.step = step; - } - - @Override - public void draw(Point pos) { - UIHelper.drawGradientRect(this.getLeft(), this.getTop(), this.getRight(), this.getBottom(), 1, 0xff999999, 0xff999999); - int offsetScaled = (int)(((double)this.getSize().getY() - (double)sizeCursor + 1) / (double)this.maxValue * (yOffset)); - UIHelper.drawGradientRect(this.getLeft(), this.getTop() + offsetScaled, this.getRight(), this.getTop() + offsetScaled + sizeCursor, 1, 0xffffffff, 0xffffffff); - } - - @Override - public void onMouseClick(MouseEvent event){ - if (event.button == 0){ - int offsetScaled = this.getTop() + (int)(((double)this.getSize().getY() - (double)sizeCursor + 1) / (double)this.maxValue * (yOffset)); - - this.drag = false; - - if (event.y < offsetScaled) - this.yOffset += this.step; - else if (event.y > offsetScaled + sizeCursor) - this.yOffset -= this.step; - else - this.drag = true; - - this.emit(Signal.VALUE_CHANGED, this.yOffset); - - } else { - super.onMouseClick(event); - } - } - - @Override - public void onMouseRelease(MouseEvent event){ - if (event.button == 0) - this.drag = false; - super.onMouseRelease(event); - } - - @Override - public void onMouseDrag(MouseEvent event){ - if (this.drag){ - int relativeY = (int)event.y - this.getTop(); - double factor = ((double)this.getSize().getY() - (double)sizeCursor + 1) / (double)this.maxValue; - this.yOffset = (int)(relativeY / factor); - this.yOffset = Math.max(this.yOffset, this.maxValue); - this.yOffset = Math.min(this.yOffset, 0); - this.emit(Signal.VALUE_CHANGED, this.yOffset); - this.emit(Signal.DRAGGED, this); - } - else - super.onMouseDrag(event); - } - - } - - IWidget attachedWidget = null; - int yOffset = 0; - int step = 5; + int yOffset = 0; + int sizeCursor = 8; + int maxValue = 0; + int step = 0; + boolean drag = false; - public ViewportScrollable( IWidget parent){ - super(parent); - this.addWidget("Cropping", new LayoutCropping(null)).setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 100.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.TOP)); - this.addWidget("Escalator", new Escalator(null, this.step * 5)).setGeometry(new WidgetGeometry(100.0, 0, 8, 100.0, CType.RELXY, CType.REL_Y, WAlign.RIGHT, WAlign.TOP)).hide(); - } + public Escalator(IWidget parent, int step) { + this.parent = parent; + this.step = step; + } - public IWidget attachWidget(IWidget widget){ - this.attachedWidget = this.getWidget("Cropping").addWidget("Cropped", widget); - return this.attachedWidget; - } + public void setOffset(int yoffset) { + this.yOffset = yoffset; + } - public IWidget getAttachedWidget(){ - return this.attachedWidget; - } - - public IWidget setStep(int step){ - this.step = step; - ((Escalator)this.getWidget("Escalator")).setStep(this.step * 5); - return this; - } - - @Override - public void draw(Point pos) {} - - @Override - public void draw(){ - //if (Display.wasResized()) - - if ((this.attachedWidget != null) && (this.attachedWidget.getSize().getY() > this.getSize().getY())) - this.getWidget("Escalator").show(); - else - this.getWidget("Escalator").hide(); - - super.draw(); - } - - @Override - public void onMouseWheel(MouseEvent event){ - this.yOffset += event.z / 120.0 * this.step; + public void setMaxValue(int value) { + this.maxValue = value; + } - this.yOffset = Math.max(this.yOffset, this.getSize().getY() - this.attachedWidget.getSize().getY()); - this.yOffset = Math.min(this.yOffset, 0); - - ((LayoutCropping)this.getWidget("Cropping")).setOffsets(0, this.yOffset); - ((Escalator)this.getWidget("Escalator")).setOffset(this.yOffset); - } - - @Override - public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params){ - if (srcwidget.equals(this.attachedWidget) && signal == Signal.GEOM_CHANGED){ - ((Escalator)this.getWidget("Escalator")).setMaxValue(this.getSize().getY() - srcwidget.getSize().getY()); - } + public void setStep(int step) { + this.step = step; + } - else if (srcwidget.equals(this.getWidget("Escalator")) && signal == Signal.VALUE_CHANGED){ - this.yOffset = (Integer)params[0]; - ((LayoutCropping)this.getWidget("Cropping")).setOffsets(0, this.yOffset); - } - else - super.onWidgetEvent(srcwidget, signal, params); - - } - - @Override - public void onMouseDrag(MouseEvent event){ - if (this.getWidget("Escalator").shouldRender() && ((Escalator)this.getWidget("Escalator")).drag) - this.getWidget("Escalator").onMouseDrag(event); - else - super.onMouseDrag(event); - } + @Override + public void draw(Point pos) { + UIHelper.drawGradientRect( + this.getLeft(), + this.getTop(), + this.getRight(), + this.getBottom(), + 1, + 0xff999999, + 0xff999999); + int offsetScaled = (int) (((double) this.getSize().getY() - (double) sizeCursor + 1) + / (double) this.maxValue + * (yOffset)); + UIHelper.drawGradientRect( + this.getLeft(), + this.getTop() + offsetScaled, + this.getRight(), + this.getTop() + offsetScaled + sizeCursor, + 1, + 0xffffffff, + 0xffffffff); + } + + @Override + public void onMouseClick(MouseEvent event) { + if (event.button == 0) { + int offsetScaled = this.getTop() + + (int) (((double) this.getSize().getY() - (double) sizeCursor + 1) / (double) this.maxValue + * (yOffset)); + + this.drag = false; + + if (event.y < offsetScaled) this.yOffset += this.step; + else if (event.y > offsetScaled + sizeCursor) this.yOffset -= this.step; + else this.drag = true; + + this.emit(Signal.VALUE_CHANGED, this.yOffset); + + } else { + super.onMouseClick(event); + } + } + + @Override + public void onMouseRelease(MouseEvent event) { + if (event.button == 0) this.drag = false; + super.onMouseRelease(event); + } + + @Override + public void onMouseDrag(MouseEvent event) { + if (this.drag) { + int relativeY = (int) event.y - this.getTop(); + double factor = ((double) this.getSize().getY() - (double) sizeCursor + 1) / (double) this.maxValue; + this.yOffset = (int) (relativeY / factor); + this.yOffset = Math.max(this.yOffset, this.maxValue); + this.yOffset = Math.min(this.yOffset, 0); + this.emit(Signal.VALUE_CHANGED, this.yOffset); + this.emit(Signal.DRAGGED, this); + } else super.onMouseDrag(event); + } + + } + + IWidget attachedWidget = null; + int yOffset = 0; + int step = 5; + + public ViewportScrollable(IWidget parent) { + super(parent); + this.addWidget("Cropping", new LayoutCropping(null)).setGeometry( + new WidgetGeometry(0.0, 0.0, 100.0, 100.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.TOP)); + this.addWidget("Escalator", new Escalator(null, this.step * 5)) + .setGeometry(new WidgetGeometry(100.0, 0, 8, 100.0, CType.RELXY, CType.REL_Y, WAlign.RIGHT, WAlign.TOP)) + .hide(); + } + + public IWidget attachWidget(IWidget widget) { + this.attachedWidget = this.getWidget("Cropping").addWidget("Cropped", widget); + return this.attachedWidget; + } + + public IWidget getAttachedWidget() { + return this.attachedWidget; + } + + public IWidget setStep(int step) { + this.step = step; + ((Escalator) this.getWidget("Escalator")).setStep(this.step * 5); + return this; + } + + @Override + public void draw(Point pos) {} + + @Override + public void draw() { + // if (Display.wasResized()) + + if ((this.attachedWidget != null) && (this.attachedWidget.getSize().getY() > this.getSize().getY())) + this.getWidget("Escalator").show(); + else this.getWidget("Escalator").hide(); + + super.draw(); + } + + @Override + public void onMouseWheel(MouseEvent event) { + this.yOffset += event.z / 120.0 * this.step; + + this.yOffset = Math.max(this.yOffset, this.getSize().getY() - this.attachedWidget.getSize().getY()); + this.yOffset = Math.min(this.yOffset, 0); + + ((LayoutCropping) this.getWidget("Cropping")).setOffsets(0, this.yOffset); + ((Escalator) this.getWidget("Escalator")).setOffset(this.yOffset); + } + + @Override + public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params) { + if (srcwidget.equals(this.attachedWidget) && signal == Signal.GEOM_CHANGED) { + ((Escalator) this.getWidget("Escalator")).setMaxValue(this.getSize().getY() - srcwidget.getSize().getY()); + } + + else if (srcwidget.equals(this.getWidget("Escalator")) && signal == Signal.VALUE_CHANGED) { + this.yOffset = (Integer) params[0]; + ((LayoutCropping) this.getWidget("Cropping")).setOffsets(0, this.yOffset); + } else super.onWidgetEvent(srcwidget, signal, params); + + } + + @Override + public void onMouseDrag(MouseEvent event) { + if (this.getWidget("Escalator").shouldRender() && ((Escalator) this.getWidget("Escalator")).drag) + this.getWidget("Escalator").onMouseDrag(event); + else super.onMouseDrag(event); + } + + @Override + public void onMouseClick(MouseEvent event) { + if (event.button == 0) { + if (!this.getWidget("Escalator").isWidgetAtCoordinates(event.x, event.y)) { + ((Escalator) this.getWidget("Escalator")).drag = false; + super.onMouseClick(event); + } else this.getWidget("Escalator").onMouseClick(event); + } else super.onMouseClick(event); + } - @Override - public void onMouseClick(MouseEvent event){ - if (event.button == 0){ - if (!this.getWidget("Escalator").isWidgetAtCoordinates(event.x, event.y)){ - ((Escalator)this.getWidget("Escalator")).drag = false; - super.onMouseClick(event); - } - else - this.getWidget("Escalator").onMouseClick(event); - } - else - super.onMouseClick(event); - } - } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java index 6ce5619..746b237 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java @@ -1,18 +1,7 @@ package mcp.mobius.waila.gui.widgets; -import java.util.ArrayList; -import java.util.HashMap; import java.util.LinkedHashMap; -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.Point; - -import com.google.common.collect.HashBasedTable; -import com.google.common.collect.Table; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureManager; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.ReverseIterator; import mcp.mobius.waila.gui.interfaces.CType; @@ -20,343 +9,367 @@ import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.RenderPriority; import mcp.mobius.waila.gui.interfaces.Signal; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.texture.TextureManager; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + public abstract class WidgetBase implements IWidget { - protected IWidget parent; - protected WidgetGeometry geom; - protected LinkedHashMap widgets = new LinkedHashMap(); - protected LinkedHashMap renderQueue_HIGH = new LinkedHashMap(); + protected IWidget parent; + protected WidgetGeometry geom; + protected LinkedHashMap widgets = new LinkedHashMap(); + protected LinkedHashMap renderQueue_HIGH = new LinkedHashMap(); protected LinkedHashMap renderQueue_MEDIUM = new LinkedHashMap(); - protected LinkedHashMap renderQueue_LOW = new LinkedHashMap(); - protected Minecraft mc; + protected LinkedHashMap renderQueue_LOW = new LinkedHashMap(); + protected Minecraft mc; protected TextureManager texManager; protected ScaledResolution rez; - protected boolean hasBlending; - protected boolean hasLight; - protected int boundTexIndex; - - protected boolean isRendering = true; - - protected float alpha = 1.0f; - - public WidgetBase(){ - this.setParent(null); - this.mc = Minecraft.getMinecraft(); - this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - this.texManager = this.mc.renderEngine; - this.setGeometry(new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY)); - } - - public WidgetBase(IWidget parent){ - this.setParent(parent); - this.mc = Minecraft.getMinecraft(); - this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - this.texManager = this.mc.renderEngine; - this.setGeometry(new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY)); - } - - ///////////////////// - // WIDGET HANDLING // - ///////////////////// - - @Override - public IWidget addWidget(String name, IWidget widget){ - return this.addWidget(name, widget, RenderPriority.MEDIUM); - } - - @Override - public IWidget addWidget(String name, IWidget widget, RenderPriority priority){ - widget.setParent(this); - this.widgets.put(name, widget); - - switch(priority){ - case LOW: - this.renderQueue_LOW.put(name, widget); - break; - case HIGH: - this.renderQueue_HIGH.put(name, widget); - break; - case MEDIUM: - this.renderQueue_MEDIUM.put(name, widget); - break; - } - + protected boolean hasBlending; + protected boolean hasLight; + protected int boundTexIndex; - return this.getWidget(name); - } - - - @Override - public IWidget getWidget(String name){ - return this.widgets.get(name); - } - - @Override - public IWidget delWidget(String name){ - IWidget widget = this.getWidget(name); - this.widgets.remove(widget); - return widget; - } + protected boolean isRendering = true; - @Override - public IWidget getWidgetAtCoordinates(double posX, double posY){ - for (IWidget widget : new ReverseIterator(this.widgets.values())) - if ((posX >= widget.getPos().getX()) && - (posX <= widget.getPos().getX() + widget.getSize().getX()) && - (posY >= widget.getPos().getY()) && - (posY <= widget.getPos().getY() + widget.getSize().getY())) - return widget.getWidgetAtCoordinates(posX, posY); - - if ((posX >= this.getPos().getX()) && - (posX <= this.getPos().getX() + this.getSize().getX()) && - (posY >= this.getPos().getY()) && - (posY <= this.getPos().getY() + this.getSize().getY())) - return this; - - return null; - } - - @Override - public boolean isWidgetAtCoordinates(double posx, double posy){ - if (this.getLeft() > posx) return false; - if (this.getRight() < posx) return false; - if (this.getTop() > posy) return false; - if (this.getBottom() < posy) return false; - return true; - } - - /////////////////////// - // IWIDGET INTERFACE // - /////////////////////// - - @Override - public IWidget getParent() { return this.parent; } - @Override - public void setParent(IWidget parent) { this.parent = parent; } - - @Override - public void draw(){ - this.saveGLState(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1.0f, 1.0f, 1.0f, this.alpha); - - this.draw(this.getPos()); - - /* - for (IWidget widget: this.widgets.values()) - if (widget.shouldRender()) - widget.draw(); - */ + protected float alpha = 1.0f; - for (IWidget widget: this.renderQueue_LOW.values()) - if (widget.shouldRender()) - widget.draw(); - - for (IWidget widget: this.renderQueue_MEDIUM.values()) - if (widget.shouldRender()) - widget.draw(); - - for (IWidget widget: this.renderQueue_HIGH.values()) - if (widget.shouldRender()) - widget.draw(); - - this.loadGLState(); - } - - @Override - public abstract void draw(Point pos); - - @Override - public IWidget setGeometry(WidgetGeometry geom) { - this.geom = geom; - this.emit(Signal.GEOM_CHANGED, this.geom); - return this; - } - - public IWidget setGeometry(double x, double y, double sx, double sy, CType fp, CType fs){ - this.setGeometry(new WidgetGeometry (x, y, sx, sy, fp, fs)); - this.emit(Signal.GEOM_CHANGED, this.geom); - return this; - } - - @Override - public WidgetGeometry getGeometry() { return this.geom; } - @Override - public Point getPos() { return this.geom.getPos(this.parent); } - @Override - public Point getSize() { return this.geom.getSize(this.parent); } - @Override - public int getLeft() { return this.getPos().getX(); } - @Override - public int getRight() { return this.getPos().getX() + this.getSize().getX(); } - @Override - public int getTop() { return this.getPos().getY(); } - @Override - public int getBottom() { return this.getPos().getY() + this.getSize().getY(); } - - @Override - public IWidget setPos(double x, double y){ - return this.setPos(x, y, this.geom.fracPosX, this.geom.fracPosY); - } - - @Override - public IWidget setPos(double x, double y, boolean fracX, boolean fracY){ - this.geom.setPos(x, y, fracX, fracY); - this.emit(Signal.GEOM_CHANGED, this.geom); - return this; - }; - - @Override - public IWidget setSize(double sx, double sy){ - return this.setSize(sx, sy, this.geom.fracSizeX, this.geom.fracSizeY); - } - - @Override - public IWidget setSize(double sx, double sy, boolean fracX, boolean fracY){ - this.geom.setSize(sx, sy, fracX, fracY); - this.emit(Signal.GEOM_CHANGED, this.geom); - return this; - }; - - @Override - public IWidget adjustSize(){ - int minleft = 9999; - int maxright = 0; - int mintop = 9999; - int maxbottom = 0; - - for (IWidget widget : this.widgets.values()){ - minleft = Math.min(minleft, widget.getLeft()); - maxright = Math.max(maxright, widget.getRight()); - - mintop = Math.min(mintop, widget.getTop()); - maxbottom = Math.max(maxbottom, widget.getBottom()); - } - - this.setSize(maxright - minleft, maxbottom - mintop, false, false); - - this.emit(Signal.GEOM_CHANGED, this.geom); - return this; - } - - //////////////////////////// - // SOME RENDERING HELPERS // - //////////////////////////// - - protected void saveGLState(){ - hasBlending = GL11.glGetBoolean(GL11.GL_BLEND); - hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING); - boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); - GL11.glPushAttrib(GL11.GL_CURRENT_BIT); - GL11.glPushMatrix(); + public WidgetBase() { + this.setParent(null); + this.mc = Minecraft.getMinecraft(); + this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + this.texManager = this.mc.renderEngine; + this.setGeometry(new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY)); } - - protected void loadGLState(){ - if (hasBlending) GL11.glEnable(GL11.GL_BLEND); else GL11.glDisable(GL11.GL_BLEND); - if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); else GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex); - GL11.glPopMatrix(); - GL11.glPopAttrib(); - //GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + + public WidgetBase(IWidget parent) { + this.setParent(parent); + this.mc = Minecraft.getMinecraft(); + this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + this.texManager = this.mc.renderEngine; + this.setGeometry(new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY)); } - - @Override - public void setAlpha(float alpha){this.alpha = alpha;}; - + + ///////////////////// + // WIDGET HANDLING // + ///////////////////// + @Override - public float getAlpha(){return this.alpha;}; - - @Override - public void show(){this.isRendering = true;}; - @Override - public void hide(){this.isRendering = false;}; - @Override - public boolean shouldRender(){return this.isRendering;}; - + public IWidget addWidget(String name, IWidget widget) { + return this.addWidget(name, widget, RenderPriority.MEDIUM); + } + + @Override + public IWidget addWidget(String name, IWidget widget, RenderPriority priority) { + widget.setParent(this); + this.widgets.put(name, widget); + + switch (priority) { + case LOW: + this.renderQueue_LOW.put(name, widget); + break; + case HIGH: + this.renderQueue_HIGH.put(name, widget); + break; + case MEDIUM: + this.renderQueue_MEDIUM.put(name, widget); + break; + } + + return this.getWidget(name); + } + + @Override + public IWidget getWidget(String name) { + return this.widgets.get(name); + } + + @Override + public IWidget delWidget(String name) { + IWidget widget = this.getWidget(name); + this.widgets.remove(widget); + return widget; + } + + @Override + public IWidget getWidgetAtCoordinates(double posX, double posY) { + for (IWidget widget : new ReverseIterator(this.widgets.values())) + if ((posX >= widget.getPos().getX()) && (posX <= widget.getPos().getX() + widget.getSize().getX()) + && (posY >= widget.getPos().getY()) + && (posY <= widget.getPos().getY() + widget.getSize().getY())) + return widget.getWidgetAtCoordinates(posX, posY); + + if ((posX >= this.getPos().getX()) && (posX <= this.getPos().getX() + this.getSize().getX()) + && (posY >= this.getPos().getY()) + && (posY <= this.getPos().getY() + this.getSize().getY())) + return this; + + return null; + } + + @Override + public boolean isWidgetAtCoordinates(double posx, double posy) { + if (this.getLeft() > posx) return false; + if (this.getRight() < posx) return false; + if (this.getTop() > posy) return false; + if (this.getBottom() < posy) return false; + return true; + } + + /////////////////////// + // IWIDGET INTERFACE // + /////////////////////// + + @Override + public IWidget getParent() { + return this.parent; + } + + @Override + public void setParent(IWidget parent) { + this.parent = parent; + } + + @Override + public void draw() { + this.saveGLState(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1.0f, 1.0f, 1.0f, this.alpha); + + this.draw(this.getPos()); + + /* + * for (IWidget widget: this.widgets.values()) if (widget.shouldRender()) widget.draw(); + */ + + for (IWidget widget : this.renderQueue_LOW.values()) if (widget.shouldRender()) widget.draw(); + + for (IWidget widget : this.renderQueue_MEDIUM.values()) if (widget.shouldRender()) widget.draw(); + + for (IWidget widget : this.renderQueue_HIGH.values()) if (widget.shouldRender()) widget.draw(); + + this.loadGLState(); + } + + @Override + public abstract void draw(Point pos); + + @Override + public IWidget setGeometry(WidgetGeometry geom) { + this.geom = geom; + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + } + + public IWidget setGeometry(double x, double y, double sx, double sy, CType fp, CType fs) { + this.setGeometry(new WidgetGeometry(x, y, sx, sy, fp, fs)); + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + } + + @Override + public WidgetGeometry getGeometry() { + return this.geom; + } + + @Override + public Point getPos() { + return this.geom.getPos(this.parent); + } + + @Override + public Point getSize() { + return this.geom.getSize(this.parent); + } + + @Override + public int getLeft() { + return this.getPos().getX(); + } + + @Override + public int getRight() { + return this.getPos().getX() + this.getSize().getX(); + } + + @Override + public int getTop() { + return this.getPos().getY(); + } + + @Override + public int getBottom() { + return this.getPos().getY() + this.getSize().getY(); + } + + @Override + public IWidget setPos(double x, double y) { + return this.setPos(x, y, this.geom.fracPosX, this.geom.fracPosY); + } + + @Override + public IWidget setPos(double x, double y, boolean fracX, boolean fracY) { + this.geom.setPos(x, y, fracX, fracY); + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + }; + + @Override + public IWidget setSize(double sx, double sy) { + return this.setSize(sx, sy, this.geom.fracSizeX, this.geom.fracSizeY); + } + + @Override + public IWidget setSize(double sx, double sy, boolean fracX, boolean fracY) { + this.geom.setSize(sx, sy, fracX, fracY); + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + }; + + @Override + public IWidget adjustSize() { + int minleft = 9999; + int maxright = 0; + int mintop = 9999; + int maxbottom = 0; + + for (IWidget widget : this.widgets.values()) { + minleft = Math.min(minleft, widget.getLeft()); + maxright = Math.max(maxright, widget.getRight()); + + mintop = Math.min(mintop, widget.getTop()); + maxbottom = Math.max(maxbottom, widget.getBottom()); + } + + this.setSize(maxright - minleft, maxbottom - mintop, false, false); + + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + } + + //////////////////////////// + // SOME RENDERING HELPERS // + //////////////////////////// + + protected void saveGLState() { + hasBlending = GL11.glGetBoolean(GL11.GL_BLEND); + hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING); + boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); + GL11.glPushAttrib(GL11.GL_CURRENT_BIT); + GL11.glPushMatrix(); + } + + protected void loadGLState() { + if (hasBlending) GL11.glEnable(GL11.GL_BLEND); + else GL11.glDisable(GL11.GL_BLEND); + if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); + else GL11.glDisable(GL11.GL_LIGHTING); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex); + GL11.glPopMatrix(); + GL11.glPopAttrib(); + // GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + } + + @Override + public void setAlpha(float alpha) { + this.alpha = alpha; + }; + + @Override + public float getAlpha() { + return this.alpha; + }; + + @Override + public void show() { + this.isRendering = true; + }; + + @Override + public void hide() { + this.isRendering = false; + }; + + @Override + public boolean shouldRender() { + return this.isRendering; + }; + //////////////////// // INPUT HANDLING // //////////////////// - + @Override - public void handleMouseInput(){} + public void handleMouseInput() {} - @Override - public void onMouseClick(MouseEvent event) { - //System.out.printf("%s %s\n", this, event); - if (this.parent != null) - this.parent.onMouseClick(event); - - //IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - //if (widget != null && widget != this) - // widget.onMouseClick(event); - } + @Override + public void onMouseClick(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + if (this.parent != null) this.parent.onMouseClick(event); - @Override - public void onMouseDrag(MouseEvent event) { - //System.out.printf("%s %s\n", this, event); - if (this.parent != null) - this.parent.onMouseDrag(event); - - //IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - //if (widget != null && widget != this) - // widget.onMouseDrag(event); - } + // IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + // if (widget != null && widget != this) + // widget.onMouseClick(event); + } - @Override - public void onMouseMove(MouseEvent event) { - //System.out.printf("%s %s\n", this, event); - if (this.parent != null) - this.parent.onMouseMove(event); - - - //IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - //if (widget != null && widget != this) - // widget.onMouseMove(event); - } + @Override + public void onMouseDrag(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + if (this.parent != null) this.parent.onMouseDrag(event); - @Override - public void onMouseRelease(MouseEvent event) { - //System.out.printf("%s %s\n", this, event); - if (this.parent != null) - this.parent.onMouseRelease(event); - - //IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); - //if (widget != null && widget != this) - // widget.onMouseRelease(event); - } + // IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + // if (widget != null && widget != this) + // widget.onMouseDrag(event); + } - @Override - public void onMouseWheel(MouseEvent event) { - //System.out.printf("%s %s\n", this, event); - if (this.parent != null) - this.parent.onMouseWheel(event); - } + @Override + public void onMouseMove(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + if (this.parent != null) this.parent.onMouseMove(event); - @Override - public void onMouseEnter(MouseEvent event) { - //System.out.printf("%s %s\n", this, event); - if (this.parent != null) - this.parent.onMouseEnter(event); - } - - @Override - public void onMouseLeave(MouseEvent event) { - //System.out.printf("%s %s\n", this, event); - if (this.parent != null) - this.parent.onMouseLeave(event); - } + // IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + // if (widget != null && widget != this) + // widget.onMouseMove(event); + } - @Override - public void emit(Signal signal, Object... params) { - if(this.parent != null) - this.parent.onWidgetEvent(this, signal, params); - } + @Override + public void onMouseRelease(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + if (this.parent != null) this.parent.onMouseRelease(event); - @Override - public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params) { - if (this.parent != null) - this.parent.onWidgetEvent(srcwidget, signal, params); - } + // IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + // if (widget != null && widget != this) + // widget.onMouseRelease(event); + } + + @Override + public void onMouseWheel(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + if (this.parent != null) this.parent.onMouseWheel(event); + } + + @Override + public void onMouseEnter(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + if (this.parent != null) this.parent.onMouseEnter(event); + } + + @Override + public void onMouseLeave(MouseEvent event) { + // System.out.printf("%s %s\n", this, event); + if (this.parent != null) this.parent.onMouseLeave(event); + } + + @Override + public void emit(Signal signal, Object... params) { + if (this.parent != null) this.parent.onWidgetEvent(this, signal, params); + } + + @Override + public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params) { + if (this.parent != null) this.parent.onWidgetEvent(srcwidget, signal, params); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java index 032c2ed..1676b50 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java @@ -3,184 +3,190 @@ package mcp.mobius.waila.gui.widgets; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; + import net.minecraft.util.MathHelper; import org.lwjgl.util.Point; +// public class WidgetGeometry implements Cloneable{ +public class WidgetGeometry { + // public enum Align {LEFT, CENTER, RIGHT, TOP, BOTTOM}; -//public class WidgetGeometry implements Cloneable{ -public class WidgetGeometry{ - - //public enum Align {LEFT, CENTER, RIGHT, TOP, BOTTOM}; + double x = -1; + double y = -1; + double sx = -1; + double sy = -1; - - double x = -1; - double y = -1; - double sx = -1; - double sy = -1; - - CType posType; - CType sizeType; - - boolean fracPosX = false; - boolean fracPosY = false; - boolean fracSizeX = false; - boolean fracSizeY = false; - - WAlign alignX; - WAlign alignY; - - public class PointDouble{ - double x; double y; - public PointDouble(double x, double y){ this.x = x; this.y = y;}; - public double getX(){return this.x;} - public double getY(){return this.y;} - public String toString(){return String.format("PointDouble : %.5f %.5f", this.x, this.y);} - } - - public WidgetGeometry(double x, double y, double sx, double sy, CType fracPos, CType fracSize){ - this(x, y, sx, sy, fracPos, fracSize, WAlign.LEFT, WAlign.TOP); - } - - public WidgetGeometry(double x, double y, double sx, double sy, CType fracPos, CType fracSize, WAlign alignX, WAlign alignY){ - this.x = x; - this.y = y; - this.sx = sx; - this.sy = sy; - this.posType = fracPos; - this.sizeType = fracSize; - - switch(fracPos){ - case REL_X: - this.fracPosX = true; - break; - case RELXY: - this.fracPosX = true; - this.fracPosY = true; - break; - case REL_Y: - this.fracPosY = true; - break; - default: - break; - - } + CType posType; + CType sizeType; - switch(fracSize){ - case REL_X: - this.fracSizeX = true; - break; - case RELXY: - this.fracSizeX = true; - this.fracSizeY = true; - break; - case REL_Y: - this.fracSizeY = true; - break; - default: - break; - - } + boolean fracPosX = false; + boolean fracPosY = false; + boolean fracSizeX = false; + boolean fracSizeY = false; - this.alignX = alignX; - this.alignY = alignY; - } - - public void setPos(double x, double y, boolean fracX, boolean fracY){ - this.x = x; - this.y = y; - this.fracPosX = fracX; - this.fracPosY = fracY; - } - - public void setSize(double sx, double sy, boolean fracSizeX, boolean fracSizeY){ - this.sx = sx; - this.sy = sy; - this.fracSizeX = fracSizeX; - this.fracSizeY = fracSizeY; - } - - public PointDouble getRawPos(){ - return new PointDouble(this.x, this.y); - } - - public Point getUnalignedPos(IWidget parent){ - int x = -1; - if (this.fracPosX) - x = MathHelper.ceiling_double_int(parent.getPos().getX() + parent.getSize().getX() * this.x / 100D); - if (!this.fracPosX && parent != null) - x = parent.getPos().getX() + (int)this.x; - if (!this.fracPosX && parent == null) - x = (int)this.x; - - int y = -1; - if (this.fracPosY) - y = MathHelper.ceiling_double_int(parent.getPos().getY() + parent.getSize().getY() * this.y / 100D); - if (!this.fracPosY && parent != null) - y = parent.getPos().getY() + (int)this.y; - if (!this.fracPosY && parent == null) - y = (int)this.y; - - return new Point(x,y); - } - - public Point getPos(IWidget parent){ - - int x = -1; - if (this.fracPosX) - x = MathHelper.ceiling_double_int(parent.getPos().getX() + parent.getSize().getX() * this.x / 100D); - if (!this.fracPosX && parent != null) - x = parent.getPos().getX() + (int)this.x; - if (!this.fracPosX && parent == null) - x = (int)this.x; - - int y = -1; - if (this.fracPosY) - y = MathHelper.ceiling_double_int(parent.getPos().getY() + parent.getSize().getY() * this.y / 100D); - if (!this.fracPosY && parent != null) - y = parent.getPos().getY() + (int)this.y; - if (!this.fracPosY && parent == null) - y = (int)this.y; - - - if (this.alignX == WAlign.CENTER) - x -= this.getSize(parent).getX() / 2; - - if (this.alignY == WAlign.CENTER) - y -= this.getSize(parent).getY() / 2; - - if (this.alignX == WAlign.RIGHT) - x -= this.getSize(parent).getX() - 1; - - if (this.alignY == WAlign.BOTTOM) - y -= this.getSize(parent).getY() - 1; - - return new Point(x,y); - } - - public Point getSize(IWidget parent){ - int sx = -1; - if (this.fracSizeX) - sx = MathHelper.ceiling_double_int(parent.getSize().getX() * this.sx / 100D); - if (!this.fracSizeX) - sx = (int)this.sx; - - int sy = -1; - if (this.fracSizeY) - sy = MathHelper.ceiling_double_int(parent.getSize().getY() * this.sy / 100D); - if (!this.fracSizeY) - sy = (int)this.sy; - - return new Point(sx,sy); - } - - public String toString(){ - return String.format("Geometry : [%s %s] [%s %s] [%s %s] [%s %s]", this.x, this.y, this.sx, this.sy, this.posType, this.sizeType, this.alignX, this.alignY); - } - - //@Override - //public WidgetGeometry clone() throws CloneNotSupportedException{ - // return (WidgetGeometry)super.clone(); - //} + WAlign alignX; + WAlign alignY; + + public class PointDouble { + + double x; + double y; + + public PointDouble(double x, double y) { + this.x = x; + this.y = y; + }; + + public double getX() { + return this.x; + } + + public double getY() { + return this.y; + } + + public String toString() { + return String.format("PointDouble : %.5f %.5f", this.x, this.y); + } + } + + public WidgetGeometry(double x, double y, double sx, double sy, CType fracPos, CType fracSize) { + this(x, y, sx, sy, fracPos, fracSize, WAlign.LEFT, WAlign.TOP); + } + + public WidgetGeometry(double x, double y, double sx, double sy, CType fracPos, CType fracSize, WAlign alignX, + WAlign alignY) { + this.x = x; + this.y = y; + this.sx = sx; + this.sy = sy; + this.posType = fracPos; + this.sizeType = fracSize; + + switch (fracPos) { + case REL_X: + this.fracPosX = true; + break; + case RELXY: + this.fracPosX = true; + this.fracPosY = true; + break; + case REL_Y: + this.fracPosY = true; + break; + default: + break; + + } + + switch (fracSize) { + case REL_X: + this.fracSizeX = true; + break; + case RELXY: + this.fracSizeX = true; + this.fracSizeY = true; + break; + case REL_Y: + this.fracSizeY = true; + break; + default: + break; + + } + + this.alignX = alignX; + this.alignY = alignY; + } + + public void setPos(double x, double y, boolean fracX, boolean fracY) { + this.x = x; + this.y = y; + this.fracPosX = fracX; + this.fracPosY = fracY; + } + + public void setSize(double sx, double sy, boolean fracSizeX, boolean fracSizeY) { + this.sx = sx; + this.sy = sy; + this.fracSizeX = fracSizeX; + this.fracSizeY = fracSizeY; + } + + public PointDouble getRawPos() { + return new PointDouble(this.x, this.y); + } + + public Point getUnalignedPos(IWidget parent) { + int x = -1; + if (this.fracPosX) + x = MathHelper.ceiling_double_int(parent.getPos().getX() + parent.getSize().getX() * this.x / 100D); + if (!this.fracPosX && parent != null) x = parent.getPos().getX() + (int) this.x; + if (!this.fracPosX && parent == null) x = (int) this.x; + + int y = -1; + if (this.fracPosY) + y = MathHelper.ceiling_double_int(parent.getPos().getY() + parent.getSize().getY() * this.y / 100D); + if (!this.fracPosY && parent != null) y = parent.getPos().getY() + (int) this.y; + if (!this.fracPosY && parent == null) y = (int) this.y; + + return new Point(x, y); + } + + public Point getPos(IWidget parent) { + + int x = -1; + if (this.fracPosX) + x = MathHelper.ceiling_double_int(parent.getPos().getX() + parent.getSize().getX() * this.x / 100D); + if (!this.fracPosX && parent != null) x = parent.getPos().getX() + (int) this.x; + if (!this.fracPosX && parent == null) x = (int) this.x; + + int y = -1; + if (this.fracPosY) + y = MathHelper.ceiling_double_int(parent.getPos().getY() + parent.getSize().getY() * this.y / 100D); + if (!this.fracPosY && parent != null) y = parent.getPos().getY() + (int) this.y; + if (!this.fracPosY && parent == null) y = (int) this.y; + + if (this.alignX == WAlign.CENTER) x -= this.getSize(parent).getX() / 2; + + if (this.alignY == WAlign.CENTER) y -= this.getSize(parent).getY() / 2; + + if (this.alignX == WAlign.RIGHT) x -= this.getSize(parent).getX() - 1; + + if (this.alignY == WAlign.BOTTOM) y -= this.getSize(parent).getY() - 1; + + return new Point(x, y); + } + + public Point getSize(IWidget parent) { + int sx = -1; + if (this.fracSizeX) sx = MathHelper.ceiling_double_int(parent.getSize().getX() * this.sx / 100D); + if (!this.fracSizeX) sx = (int) this.sx; + + int sy = -1; + if (this.fracSizeY) sy = MathHelper.ceiling_double_int(parent.getSize().getY() * this.sy / 100D); + if (!this.fracSizeY) sy = (int) this.sy; + + return new Point(sx, sy); + } + + public String toString() { + return String.format( + "Geometry : [%s %s] [%s %s] [%s %s] [%s %s]", + this.x, + this.y, + this.sx, + this.sy, + this.posType, + this.sizeType, + this.alignX, + this.alignY); + } + + // @Override + // public WidgetGeometry clone() throws CloneNotSupportedException{ + // return (WidgetGeometry)super.clone(); + // } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java index a3bcbe9..c25fd7b 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java @@ -6,6 +6,7 @@ import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.Signal; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetBase; + import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.util.ResourceLocation; @@ -14,61 +15,65 @@ import org.lwjgl.util.Point; public abstract class ButtonBase extends WidgetBase { - protected boolean mouseOver = false; - protected static ResourceLocation widgetsTexture = new ResourceLocation("textures/gui/widgets.png"); - - public ButtonBase(IWidget parent){ - super(parent); - } + protected boolean mouseOver = false; + protected static ResourceLocation widgetsTexture = new ResourceLocation("textures/gui/widgets.png"); - @Override - public void draw() { + public ButtonBase(IWidget parent) { + super(parent); + } + + @Override + public void draw() { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - for (IWidget widget : this.widgets.values()) - if (widget instanceof LabelFixedFont) - if (this.mouseOver) - ((LabelFixedFont)widget).setColor(0xffffa0); - else - ((LabelFixedFont)widget).setColor(0xffffff); - - super.draw(); - } - - @Override - public void draw(Point pos) { - this.saveGLState(); - int texOffset = 0; - if (this.mouseOver) - texOffset = 1; - - this.mc.getTextureManager().bindTexture(widgetsTexture); - UIHelper.drawTexture(this.getPos().getX(), this.getPos().getY(), this.getSize().getX(), this.getSize().getY(), 0, 66 + texOffset*20, 200, 20); - - this.loadGLState(); - } + for (IWidget widget : this.widgets.values()) + if (widget instanceof LabelFixedFont) if (this.mouseOver) ((LabelFixedFont) widget).setColor(0xffffa0); + else((LabelFixedFont) widget).setColor(0xffffff); - @Override - public void onMouseEnter(MouseEvent event){ - mouseOver = true; - } + super.draw(); + } - @Override - public void onMouseLeave(MouseEvent event){ - mouseOver = false; - } + @Override + public void draw(Point pos) { + this.saveGLState(); + int texOffset = 0; - @Override - public IWidget getWidgetAtCoordinates(double posX, double posY){ - return this; - } - - @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.emit(Signal.CLICKED, event.button); - } + if (this.mouseOver) texOffset = 1; + + this.mc.getTextureManager().bindTexture(widgetsTexture); + UIHelper.drawTexture( + this.getPos().getX(), + this.getPos().getY(), + this.getSize().getX(), + this.getSize().getY(), + 0, + 66 + texOffset * 20, + 200, + 20); + + this.loadGLState(); + } + + @Override + public void onMouseEnter(MouseEvent event) { + mouseOver = true; + } + + @Override + public void onMouseLeave(MouseEvent event) { + mouseOver = false; + } + + @Override + public IWidget getWidgetAtCoordinates(double posX, double posY) { + return this; + } + + @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.emit(Signal.CLICKED, event.button); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java index f89c3bc..54baa63 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java @@ -1,43 +1,56 @@ package mcp.mobius.waila.gui.widgets.buttons; import mcp.mobius.waila.gui.events.MouseEvent; -import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.util.Point; public class ButtonBoolean extends ButtonBase { - protected boolean state = false; - - public ButtonBoolean(IWidget parent, String textFalse, String textTrue){ - super(parent); - - this.addWidget("LabelFalse", new LabelFixedFont(this, textFalse)); - this.getWidget("LabelFalse").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - this.addWidget("LabelTrue", new LabelFixedFont(this, textTrue)); - this.getWidget("LabelTrue").hide(); - this.getWidget("LabelTrue").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - } - - @Override - public void onMouseClick(MouseEvent event){ - super.onMouseClick(event); - - if (event.button == 0) - this.state = !this.state; - - if (this.state){ - this.getWidget("LabelTrue").show(); - this.getWidget("LabelFalse").hide(); - } else { - this.getWidget("LabelTrue").hide(); - this.getWidget("LabelFalse").show(); - } - } + protected boolean state = false; + + public ButtonBoolean(IWidget parent, String textFalse, String textTrue) { + super(parent); + + this.addWidget("LabelFalse", new LabelFixedFont(this, textFalse)); + this.getWidget("LabelFalse").setGeometry( + new WidgetGeometry( + 50.0D, + 50.0D, + 100.0D, + 20.0D, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); + this.addWidget("LabelTrue", new LabelFixedFont(this, textTrue)); + this.getWidget("LabelTrue").hide(); + this.getWidget("LabelTrue").setGeometry( + new WidgetGeometry( + 50.0D, + 50.0D, + 100.0D, + 20.0D, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); + } + + @Override + public void onMouseClick(MouseEvent event) { + super.onMouseClick(event); + + if (event.button == 0) this.state = !this.state; + + if (this.state) { + this.getWidget("LabelTrue").show(); + this.getWidget("LabelFalse").hide(); + } else { + this.getWidget("LabelTrue").hide(); + this.getWidget("LabelFalse").show(); + } + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java index 68fa5cd..56313f6 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java @@ -1,62 +1,65 @@ package mcp.mobius.waila.gui.widgets.buttons; -import org.lwjgl.util.Point; - -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; -import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; -public class ButtonBooleanConfig extends ButtonBoolean { - - protected String category; - protected String configKey; - protected boolean instant; +import org.lwjgl.util.Point; + +public class ButtonBooleanConfig extends ButtonBoolean { + + protected String category; + protected String configKey; + protected boolean instant; + + public ButtonBooleanConfig(IWidget parent, String category, String configKey, String textFalse, String textTrue) { + this(parent, category, configKey, true, true, textFalse, textTrue); + } + + public ButtonBooleanConfig(IWidget parent, String category, String configKey, boolean instant, boolean state_, + String textFalse, String textTrue) { + super(parent, textFalse, textTrue); + this.category = category; + this.configKey = configKey; + this.instant = instant; + + this.state = ConfigHandler.instance().getConfig(this.category, this.configKey, state_); + + if (this.state) { + this.getWidget("LabelTrue").show(); + this.getWidget("LabelFalse").hide(); + } else { + this.getWidget("LabelTrue").hide(); + this.getWidget("LabelFalse").show(); + } + } + + @Override + public void onMouseClick(MouseEvent event) { + if (!ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) super.onMouseClick(event); + + if (this.instant) ConfigHandler.instance().setConfig(this.category, this.configKey, this.state); + } + + @Override + public void draw(Point pos) { + if (!ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) super.draw(pos); + else { + this.saveGLState(); + int texOffset = -1; + this.mc.getTextureManager().bindTexture(widgetsTexture); + UIHelper.drawTexture( + this.getPos().getX(), + this.getPos().getY(), + this.getSize().getX(), + this.getSize().getY(), + 0, + 66 + texOffset * 20, + 200, + 20); + this.loadGLState(); + } + } - public ButtonBooleanConfig(IWidget parent, String category, String configKey, String textFalse, String textTrue){ - this(parent, category, configKey, true, true, textFalse, textTrue); - } - - public ButtonBooleanConfig(IWidget parent, String category, String configKey, boolean instant, boolean state_, String textFalse, String textTrue){ - super(parent, textFalse, textTrue); - this.category = category; - this.configKey = configKey; - this.instant = instant; - - this.state = ConfigHandler.instance().getConfig(this.category, this.configKey, state_); - - if (this.state){ - this.getWidget("LabelTrue").show(); - this.getWidget("LabelFalse").hide(); - } else { - this.getWidget("LabelTrue").hide(); - this.getWidget("LabelFalse").show(); - } - } - - @Override - public void onMouseClick(MouseEvent event){ - if (!ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) - super.onMouseClick(event); - - if (this.instant) - ConfigHandler.instance().setConfig(this.category, this.configKey, this.state); - } - - @Override - public void draw(Point pos) { - if (!ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) - super.draw(pos); - else{ - this.saveGLState(); - int texOffset = -1; - this.mc.getTextureManager().bindTexture(widgetsTexture); - UIHelper.drawTexture(this.getPos().getX(), this.getPos().getY(), this.getSize().getX(), this.getSize().getY(), 0, 66 + texOffset*20, 200, 20); - this.loadGLState(); - } - } - } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java index af57221..cbf7837 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java @@ -1,52 +1,58 @@ package mcp.mobius.waila.gui.widgets.buttons; -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.Point; - -import net.minecraftforge.common.config.Configuration; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; -import mcp.mobius.waila.gui.widgets.LabelFixedFont; + +import org.lwjgl.util.Point; public class ButtonBooleanConfigRemote extends ButtonBooleanConfig { - public ButtonBooleanConfigRemote(IWidget parent, String category, String configKey, String textFalse, String textTrue){ - this(parent, category, configKey, true, true, textFalse, textTrue); - } - - public ButtonBooleanConfigRemote(IWidget parent, String category, String configKey, boolean instant, boolean state_, String textFalse, String textTrue){ - super(parent, category, configKey, instant, state_, textFalse, textTrue); - if (!Waila.instance.serverPresent) - this.state = false; - - if (this.state){ - this.getWidget("LabelTrue").show(); - this.getWidget("LabelFalse").hide(); - } else { - this.getWidget("LabelTrue").hide(); - this.getWidget("LabelFalse").show(); - } - } + public ButtonBooleanConfigRemote(IWidget parent, String category, String configKey, String textFalse, + String textTrue) { + this(parent, category, configKey, true, true, textFalse, textTrue); + } - @Override - public void onMouseClick(MouseEvent event){ - if ((Waila.instance.serverPresent) && !ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) - super.onMouseClick(event); - } - - @Override - public void draw(Point pos) { - if ((Waila.instance.serverPresent) && !ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) - super.draw(pos); - else{ - this.saveGLState(); - int texOffset = -1; - this.mc.getTextureManager().bindTexture(widgetsTexture); - UIHelper.drawTexture(this.getPos().getX(), this.getPos().getY(), this.getSize().getX(), this.getSize().getY(), 0, 66 + texOffset*20, 200, 20); - this.loadGLState(); - } - } + public ButtonBooleanConfigRemote(IWidget parent, String category, String configKey, boolean instant, boolean state_, + String textFalse, String textTrue) { + super(parent, category, configKey, instant, state_, textFalse, textTrue); + if (!Waila.instance.serverPresent) this.state = false; + + if (this.state) { + this.getWidget("LabelTrue").show(); + this.getWidget("LabelFalse").hide(); + } else { + this.getWidget("LabelTrue").hide(); + this.getWidget("LabelFalse").show(); + } + } + + @Override + public void onMouseClick(MouseEvent event) { + if ((Waila.instance.serverPresent) && !ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) + super.onMouseClick(event); + } + + @Override + public void draw(Point pos) { + if ((Waila.instance.serverPresent) && !ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) + super.draw(pos); + else { + this.saveGLState(); + int texOffset = -1; + this.mc.getTextureManager().bindTexture(widgetsTexture); + UIHelper.drawTexture( + this.getPos().getX(), + this.getPos().getY(), + this.getSize().getX(), + this.getSize().getY(), + 0, + 66 + texOffset * 20, + 200, + 20); + this.loadGLState(); + } + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java index 7b02b89..f552528 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java @@ -1,50 +1,67 @@ package mcp.mobius.waila.gui.widgets.buttons; -import org.lwjgl.util.Point; - import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; -import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.WidgetBase; import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import org.lwjgl.util.Point; + public class ButtonContainer extends WidgetBase { - private int nButtons = 0; - private int columns; - private int buttonSize; - private double spacing; - - public ButtonContainer(IWidget parent, int columns, int buttonSize, double spacing){ - super (parent); - this.columns = columns; - this.spacing = spacing; - this.buttonSize = buttonSize; - } - - public void addButton(ButtonBase button){ - String buttonName = String.format("Button_%d", nButtons); - String layoutName = String.format("Layout_%d", nButtons); - String layoutLabelName = String.format("LayoutLabel_%d", nButtons); - String labelName = String.format("Label_%d", nButtons); - - this.addWidget(layoutName, new LayoutBase(this)); - this.addWidget(layoutLabelName, new LayoutBase(this)); - - int column = this.nButtons % this.columns; - int row = this.nButtons / this.columns; - double sizeColumn = 100.0 / this.columns; - - this.getWidget(layoutName).setGeometry(new WidgetGeometry(sizeColumn * column, spacing * row, sizeColumn, spacing, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); - this.getWidget(layoutName).addWidget(buttonName, button); - this.getWidget(layoutName).getWidget(buttonName).setGeometry(new WidgetGeometry(50.0, 50.0, buttonSize, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - - this.nButtons += 1; - } - - @Override - public void draw(Point pos) {} + private int nButtons = 0; + private int columns; + private int buttonSize; + private double spacing; + + public ButtonContainer(IWidget parent, int columns, int buttonSize, double spacing) { + super(parent); + this.columns = columns; + this.spacing = spacing; + this.buttonSize = buttonSize; + } + + public void addButton(ButtonBase button) { + String buttonName = String.format("Button_%d", nButtons); + String layoutName = String.format("Layout_%d", nButtons); + String layoutLabelName = String.format("LayoutLabel_%d", nButtons); + String labelName = String.format("Label_%d", nButtons); + + this.addWidget(layoutName, new LayoutBase(this)); + this.addWidget(layoutLabelName, new LayoutBase(this)); + + int column = this.nButtons % this.columns; + int row = this.nButtons / this.columns; + double sizeColumn = 100.0 / this.columns; + + this.getWidget(layoutName).setGeometry( + new WidgetGeometry( + sizeColumn * column, + spacing * row, + sizeColumn, + spacing, + CType.REL_X, + CType.REL_X, + WAlign.LEFT, + WAlign.TOP)); + this.getWidget(layoutName).addWidget(buttonName, button); + this.getWidget(layoutName).getWidget(buttonName).setGeometry( + new WidgetGeometry( + 50.0, + 50.0, + buttonSize, + 20.0, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); + + this.nButtons += 1; + } + + @Override + public void draw(Point pos) {} } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java index c7d7b6f..6483bcf 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java @@ -10,46 +10,82 @@ import mcp.mobius.waila.gui.widgets.WidgetGeometry; import org.lwjgl.util.Point; -//TODO : THIS CLASS IS WIP AND CAN'T WORK RIGHT NOW +// TODO : THIS CLASS IS WIP AND CAN'T WORK RIGHT NOW public class ButtonContainerLabel extends WidgetBase { - private int nButtons = 0; - private int columns; - private int buttonSize; - private double spacing; - - public ButtonContainerLabel(IWidget parent, int columns, int buttonSize, double spacing){ - super (parent); - this.columns = columns; - this.spacing = spacing; - this.buttonSize = buttonSize; - } - - public void addButton(ButtonBase button, String label){ - String buttonName = String.format("Button_%d", nButtons); - String layoutName = String.format("Layout_%d", nButtons); - String layoutLabelName = String.format("LayoutLabel_%d", nButtons); - String labelName = String.format("Label_%d", nButtons); - - this.addWidget(layoutName, new LayoutBase(this)); - this.addWidget(layoutLabelName, new LayoutBase(this)); - - int column = (this.nButtons % this.columns) * 2; - int row = this.nButtons / this.columns; - double sizeColumn = 100.0 / (this.columns * 2); - - this.getWidget(layoutName).setGeometry(new WidgetGeometry(sizeColumn * (column + 1), spacing * row, sizeColumn, spacing, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); - this.getWidget(layoutName).addWidget(buttonName, button); - this.getWidget(layoutName).getWidget(buttonName).setGeometry(new WidgetGeometry(50.0, 50.0, buttonSize, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + private int nButtons = 0; + private int columns; + private int buttonSize; + private double spacing; - this.getWidget(layoutLabelName).setGeometry(new WidgetGeometry(sizeColumn * column, spacing * row, sizeColumn, spacing, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); - this.getWidget(layoutLabelName).addWidget(labelName, new LabelFixedFont(this, label)); - this.getWidget(layoutLabelName).getWidget(labelName).setGeometry(new WidgetGeometry(50.0, 50.0, buttonSize, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - - this.nButtons += 1; - } - - @Override - public void draw(Point pos) {} + public ButtonContainerLabel(IWidget parent, int columns, int buttonSize, double spacing) { + super(parent); + this.columns = columns; + this.spacing = spacing; + this.buttonSize = buttonSize; + } + + public void addButton(ButtonBase button, String label) { + String buttonName = String.format("Button_%d", nButtons); + String layoutName = String.format("Layout_%d", nButtons); + String layoutLabelName = String.format("LayoutLabel_%d", nButtons); + String labelName = String.format("Label_%d", nButtons); + + this.addWidget(layoutName, new LayoutBase(this)); + this.addWidget(layoutLabelName, new LayoutBase(this)); + + int column = (this.nButtons % this.columns) * 2; + int row = this.nButtons / this.columns; + double sizeColumn = 100.0 / (this.columns * 2); + + this.getWidget(layoutName).setGeometry( + new WidgetGeometry( + sizeColumn * (column + 1), + spacing * row, + sizeColumn, + spacing, + CType.REL_X, + CType.REL_X, + WAlign.LEFT, + WAlign.TOP)); + this.getWidget(layoutName).addWidget(buttonName, button); + this.getWidget(layoutName).getWidget(buttonName).setGeometry( + new WidgetGeometry( + 50.0, + 50.0, + buttonSize, + 20.0, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); + + this.getWidget(layoutLabelName).setGeometry( + new WidgetGeometry( + sizeColumn * column, + spacing * row, + sizeColumn, + spacing, + CType.REL_X, + CType.REL_X, + WAlign.LEFT, + WAlign.TOP)); + this.getWidget(layoutLabelName).addWidget(labelName, new LabelFixedFont(this, label)); + this.getWidget(layoutLabelName).getWidget(labelName).setGeometry( + new WidgetGeometry( + 50.0, + 50.0, + buttonSize, + 20.0, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); + + this.nButtons += 1; + } + + @Override + public void draw(Point pos) {} } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java index e322cbb..328ab07 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java @@ -1,49 +1,51 @@ package mcp.mobius.waila.gui.widgets.buttons; import mcp.mobius.waila.gui.events.MouseEvent; -import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.util.Point; public class ButtonInteger extends ButtonBase { - protected int state = 0; - protected int nStates; - - public ButtonInteger(IWidget parent, String... texts){ - super(parent); - - this.nStates = texts.length; - - for (int i = 0; i < texts.length; i++){ - String labelName = String.format("Label_%d", i); - this.addWidget(labelName, new LabelFixedFont(this, texts[i])); - this.getWidget(labelName).hide(); - this.getWidget(labelName).setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - } - this.getWidget("Label_0").show(); - } + protected int state = 0; + protected int nStates; - @Override - public void onMouseClick(MouseEvent event){ - super.onMouseClick(event); - - if (event.button == 0) - this.state += 1; - - if (this.state >= this.nStates) - this.state = 0; - - for (int i = 0; i < this.nStates; i++) - this.getWidget(String.format("Label_%d", i)).hide(); - - this.getWidget(String.format("Label_%d", state)).show(); - } + public ButtonInteger(IWidget parent, String... texts) { + super(parent); + + this.nStates = texts.length; + + for (int i = 0; i < texts.length; i++) { + String labelName = String.format("Label_%d", i); + this.addWidget(labelName, new LabelFixedFont(this, texts[i])); + this.getWidget(labelName).hide(); + this.getWidget(labelName).setGeometry( + new WidgetGeometry( + 50.0D, + 50.0D, + 100.0D, + 20.0D, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); + } + this.getWidget("Label_0").show(); + } + + @Override + public void onMouseClick(MouseEvent event) { + super.onMouseClick(event); + + if (event.button == 0) this.state += 1; + + if (this.state >= this.nStates) this.state = 0; + + for (int i = 0; i < this.nStates; i++) this.getWidget(String.format("Label_%d", i)).hide(); + + this.getWidget(String.format("Label_%d", state)).show(); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java index db10661..1782d0e 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java @@ -1,45 +1,38 @@ package mcp.mobius.waila.gui.widgets.buttons; -import net.minecraftforge.common.config.Configuration; - -import org.lwjgl.util.Point; - -import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.interfaces.IWidget; -import mcp.mobius.waila.gui.widgets.WidgetBase; public class ButtonIntegerConfig extends ButtonInteger { - private String category; - private String configKey; - private boolean instant; + private String category; + private String configKey; + private boolean instant; - public ButtonIntegerConfig(IWidget parent, String category, String configKey, String... texts){ - this(parent, category, configKey, true, 0, texts); - } - - public ButtonIntegerConfig(IWidget parent, String category, String configKey, boolean instant, int state_, String... texts){ - super(parent, texts); - this.category = category; - this.configKey = configKey; - this.instant = instant; - - this.state = ConfigHandler.instance().getConfig(this.category, this.configKey, state_); - - for (int i = 0; i < this.nStates; i++) - this.getWidget(String.format("Label_%d", i)).hide(); - - this.getWidget(String.format("Label_%d", state)).show(); - } - - @Override - public void onMouseClick(MouseEvent event){ - super.onMouseClick(event); - - if (this.instant) - ConfigHandler.instance().setConfig(this.category, this.configKey, this.state); - } + public ButtonIntegerConfig(IWidget parent, String category, String configKey, String... texts) { + this(parent, category, configKey, true, 0, texts); + } + + public ButtonIntegerConfig(IWidget parent, String category, String configKey, boolean instant, int state_, + String... texts) { + super(parent, texts); + this.category = category; + this.configKey = configKey; + this.instant = instant; + + this.state = ConfigHandler.instance().getConfig(this.category, this.configKey, state_); + + for (int i = 0; i < this.nStates; i++) this.getWidget(String.format("Label_%d", i)).hide(); + + this.getWidget(String.format("Label_%d", state)).show(); + } + + @Override + public void onMouseClick(MouseEvent event) { + super.onMouseClick(event); + + if (this.instant) ConfigHandler.instance().setConfig(this.category, this.configKey, this.state); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java index 9bef571..1eb5b43 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java @@ -6,19 +6,27 @@ import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import net.minecraft.client.gui.GuiScreen; public class ButtonLabel extends ButtonBase { - - public ButtonLabel(IWidget parent, String text){ - super(parent); - - this.addWidget("Label", new LabelFixedFont(this, text)); - this.getWidget("Label").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - } - - @Override - public void onMouseClick(MouseEvent event){ - super.onMouseClick(event); - } + + public ButtonLabel(IWidget parent, String text) { + super(parent); + + this.addWidget("Label", new LabelFixedFont(this, text)); + this.getWidget("Label").setGeometry( + new WidgetGeometry( + 50.0D, + 50.0D, + 100.0D, + 20.0D, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); + } + + @Override + public void onMouseClick(MouseEvent event) { + super.onMouseClick(event); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java index 8665fb2..cc2ae97 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java @@ -1,31 +1,39 @@ package mcp.mobius.waila.gui.widgets.buttons; -import net.minecraft.client.gui.GuiScreen; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; -import mcp.mobius.waila.gui.screens.ScreenBase; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import net.minecraft.client.gui.GuiScreen; + public class ButtonScreenChange extends ButtonBase { - - GuiScreen linkedScreen; - - public ButtonScreenChange(IWidget parent, String text, GuiScreen linkedscreen){ - super(parent); - this.linkedScreen = linkedscreen; - - this.addWidget("Label", new LabelFixedFont(this, text)); - this.getWidget("Label").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); - } - - @Override - public void onMouseClick(MouseEvent event){ - super.onMouseClick(event); - - if (event.button == 0) - this.mc.displayGuiScreen(this.linkedScreen); - } + + GuiScreen linkedScreen; + + public ButtonScreenChange(IWidget parent, String text, GuiScreen linkedscreen) { + super(parent); + this.linkedScreen = linkedscreen; + + this.addWidget("Label", new LabelFixedFont(this, text)); + this.getWidget("Label").setGeometry( + new WidgetGeometry( + 50.0D, + 50.0D, + 100.0D, + 20.0D, + CType.RELXY, + CType.ABSXY, + WAlign.CENTER, + WAlign.CENTER)); + } + + @Override + public void onMouseClick(MouseEvent event) { + super.onMouseClick(event); + + if (event.button == 0) this.mc.displayGuiScreen(this.linkedScreen); + } } diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java index ce3fdc4..d595828 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java @@ -2,67 +2,64 @@ package mcp.mobius.waila.gui.widgets.movable; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; -import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.Signal; -import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.widgets.WidgetBase; -import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import mcp.mobius.waila.gui.widgets.WidgetGeometry.PointDouble; + import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Point; - // A movable picture setup especially for centered relative positions. - + public class PictureMovableRC extends WidgetBase { - - private double offsetX, offsetY; - protected ResourceLocation texture; - - public PictureMovableRC(IWidget parent, String uri) { - super(parent); - this.texture = new ResourceLocation(uri); - } - - @Override - public void onMouseClick(MouseEvent event){ - this.offsetX = event.x - this.geom.getUnalignedPos(this.parent).getX(); - this.offsetY = event.y - this.geom.getUnalignedPos(this.parent).getY(); - //System.out.printf("%s %s\n", this.offsetX, this.offsetY); - } - - @Override - public void onMouseDrag(MouseEvent event){ - double newX = event.x - this.offsetX ; - double newY = event.y - this.offsetY ; - newX = Math.max(newX, this.parent.getLeft()); - newY = Math.max(newY, this.parent.getTop()); + private double offsetX, offsetY; + protected ResourceLocation texture; - newX = Math.min(newX, this.parent.getRight()); - newY = Math.min(newY, this.parent.getBottom()); + public PictureMovableRC(IWidget parent, String uri) { + super(parent); + this.texture = new ResourceLocation(uri); + } - this.setPos(((newX - this.parent.getLeft()) / this.parent.getSize().getX()) * 100.0, ((newY - this.parent.getTop())/ this.parent.getSize().getY()) * 100.0); - - //System.out.printf("%s\n", this.parent.getGeometry()); - //System.out.printf("%s %s\n", this.parent.getPos(), this.parent.getSize()); - - this.emit(Signal.DRAGGED, this.getPos()); - } - - @Override - public void draw(Point pos) { - this.saveGLState(); - - GL11.glPushMatrix(); - this.texManager.bindTexture(texture); - UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); - GL11.glPopMatrix(); + @Override + public void onMouseClick(MouseEvent event) { + this.offsetX = event.x - this.geom.getUnalignedPos(this.parent).getX(); + this.offsetY = event.y - this.geom.getUnalignedPos(this.parent).getY(); + // System.out.printf("%s %s\n", this.offsetX, this.offsetY); + } - this.loadGLState(); - } + @Override + public void onMouseDrag(MouseEvent event) { + double newX = event.x - this.offsetX; + double newY = event.y - this.offsetY; + + newX = Math.max(newX, this.parent.getLeft()); + newY = Math.max(newY, this.parent.getTop()); + + newX = Math.min(newX, this.parent.getRight()); + newY = Math.min(newY, this.parent.getBottom()); + + this.setPos( + ((newX - this.parent.getLeft()) / this.parent.getSize().getX()) * 100.0, + ((newY - this.parent.getTop()) / this.parent.getSize().getY()) * 100.0); + + // System.out.printf("%s\n", this.parent.getGeometry()); + // System.out.printf("%s %s\n", this.parent.getPos(), this.parent.getSize()); + + this.emit(Signal.DRAGGED, this.getPos()); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + + GL11.glPushMatrix(); + this.texManager.bindTexture(texture); + UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); + GL11.glPopMatrix(); + + this.loadGLState(); + } } - diff --git a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java index 9f5091c..953bb10 100644 --- a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java @@ -2,11 +2,6 @@ package mcp.mobius.waila.handlers; import java.util.List; -import org.apache.logging.log4j.Level; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaConfigHandler; @@ -15,38 +10,51 @@ import mcp.mobius.waila.api.IWailaFMPDecorator; import mcp.mobius.waila.api.impl.DataAccessorFMP; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import org.apache.logging.log4j.Level; + public class DecoratorFMP implements IWailaBlockDecorator { - @Override - public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) { - NBTTagList list = accessor.getNBTData().getTagList("parts", 10); - for (int i = 0; i < list.tagCount(); i++){ - NBTTagCompound subtag = list.getCompoundTagAt(i); - String id = subtag.getString("id"); + @Override + public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) { + NBTTagList list = accessor.getNBTData().getTagList("parts", 10); + for (int i = 0; i < list.tagCount(); i++) { + NBTTagCompound subtag = list.getCompoundTagAt(i); + String id = subtag.getString("id"); - if (ModuleRegistrar.instance().hasFMPDecorator(id)){ - DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id, accessor.getRenderingPosition(), accessor.getPartialFrame()); - - for (List providersList : ModuleRegistrar.instance().getFMPDecorators(id).values()) - for (IWailaFMPDecorator provider : providersList) - provider.decorateBlock(itemStack, DataAccessorFMP.instance, config); - } - } - } + if (ModuleRegistrar.instance().hasFMPDecorator(id)) { + DataAccessorFMP.instance.set( + accessor.getWorld(), + accessor.getPlayer(), + accessor.getPosition(), + subtag, + id, + accessor.getRenderingPosition(), + accessor.getPartialFrame()); - public static void register(){ - Class BlockMultipart = null; - try{ - BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[FMP] Class not found. " + e); - return; - } catch (Exception e){ - Waila.log.log(Level.WARN, "[FMP] Unhandled exception." + e); - return; - } + for (List providersList : ModuleRegistrar.instance().getFMPDecorators(id).values()) + for (IWailaFMPDecorator provider : providersList) + provider.decorateBlock(itemStack, DataAccessorFMP.instance, config); + } + } + } + + public static void register() { + Class BlockMultipart = null; + try { + BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[FMP] Class not found. " + e); + return; + } catch (Exception e) { + Waila.log.log(Level.WARN, "[FMP] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().registerDecorator(new DecoratorFMP(), BlockMultipart); + } - ModuleRegistrar.instance().registerDecorator(new DecoratorFMP(), BlockMultipart); - } - } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index 6b12026..ae24a30 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -1,9 +1,9 @@ package mcp.mobius.waila.handlers; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; -import cpw.mods.fml.common.registry.GameData; -import static mcp.mobius.waila.api.SpecialChars.*; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -11,86 +11,83 @@ import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.overlay.DisplayUtil; import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.ModIdentification; -import net.minecraft.block.Block; + import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.config.Configuration; public class HUDHandlerBlocks implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { String name = null; - try - { + try { String s = DisplayUtil.itemDisplayNameShort(itemStack); - if(s != null && !s.endsWith("Unnamed")) - name = s; + if (s != null && !s.endsWith("Unnamed")) name = s; - if(name != null) - currenttip.add(name); - } - catch(Exception e) - { - } + if (name != null) currenttip.add(name); + } catch (Exception e) {} - if(itemStack.getItem() == Items.redstone) - { + if (itemStack.getItem() == Items.redstone) { int md = accessor.getMetadata(); - String s = ""+md; - if(s.length() < 2) - s=" "+s; - currenttip.set(currenttip.size()-1, name+" "+s); - } - - if (currenttip.size() == 0) - currenttip.add("< Unnamed >"); - else{ - if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true)){ - currenttip.add(String.format(ITALIC + "[%d:%d] | %s", accessor.getBlockID(), accessor.getMetadata(), accessor.getBlockQualifiedName())); - } - } - return currenttip; - } + String s = "" + md; + if (s.length() < 2) s = " " + s; + currenttip.set(currenttip.size() - 1, name + " " + s); + } - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - /* - if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, false) && currenttip.size() > 0 && !accessor.getPlayer().isSneaking()){ - currenttip.clear(); - currenttip.add(ITALIC + "Press shift for more data"); - return currenttip; - } - */ - return currenttip; - } + if (currenttip.size() == 0) currenttip.add("< Unnamed >"); + else { + if (ConfigHandler.instance() + .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true)) { + currenttip.add( + String.format( + ITALIC + "[%d:%d] | %s", + accessor.getBlockID(), + accessor.getMetadata(), + accessor.getBlockQualifiedName())); + } + } + return currenttip; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - currenttip.add(RENDER + "{Plip}" + RENDER + "{Plop,thisisatest,222,333}"); - - String modName = ModIdentification.nameFromStack(itemStack); - if (modName != null && !modName.equals("")){ - currenttip.add(BLUE + ITALIC + modName); - } - - return currenttip; - } + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + /* + * if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, false) + * && currenttip.size() > 0 && !accessor.getPlayer().isSneaking()){ currenttip.clear(); currenttip.add(ITALIC + + * "Press shift for more data"); return currenttip; } + */ + return currenttip; + } - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - return tag; - } + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + currenttip.add(RENDER + "{Plip}" + RENDER + "{Plop,thisisatest,222,333}"); + + String modName = ModIdentification.nameFromStack(itemStack); + if (modName != null && !modName.equals("")) { + currenttip.add(BLUE + ITALIC + modName); + } + + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + return tag; + } } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java index 359ddb4..a4c36cf 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java @@ -1,89 +1,102 @@ package mcp.mobius.waila.handlers; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.api.IWailaEntityProvider; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaEntityAccessor; -import mcp.mobius.waila.api.IWailaEntityProvider; -import static mcp.mobius.waila.api.SpecialChars.*; + +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; public class HUDHandlerEntities implements IWailaEntityProvider { - public static int nhearts = 20; - public static float maxhpfortext = 40.0f; - - @Override - public Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config) { - return null; - } + public static int nhearts = 20; + public static float maxhpfortext = 40.0f; - @Override - public List getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { - try{ - currenttip.add(WHITE + entity.getCommandSenderName()); - } catch (Exception e){ - currenttip.add(WHITE + "Unknown"); - } - return currenttip; - } + @Override + public Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaBody(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("general.showhp")) return currenttip; - - if (entity instanceof EntityLivingBase){ - String hptip = ""; - - nhearts = nhearts <= 0 ? 20 : nhearts; - - float health = ((EntityLivingBase)entity).getHealth() / 2.0f; - float maxhp = ((EntityLivingBase)entity).getMaxHealth() / 2.0f; - - if (((EntityLivingBase)entity).getMaxHealth() > maxhpfortext) - currenttip.add(String.format("HP : " + WHITE + "%.0f" + GRAY + " / " + WHITE + "%.0f", ((EntityLivingBase)entity).getHealth(), ((EntityLivingBase)entity).getMaxHealth())); - - else{ - currenttip.add(getRenderString("waila.health", String.valueOf(nhearts), String.valueOf(health), String.valueOf(maxhp))); - } - } + @Override + public List getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, + IWailaConfigHandler config) { + try { + currenttip.add(WHITE + entity.getCommandSenderName()); + } catch (Exception e) { + currenttip.add(WHITE + "Unknown"); + } + return currenttip; + } - return currenttip; - } + @Override + public List getWailaBody(Entity entity, List currenttip, IWailaEntityAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("general.showhp")) return currenttip; - @Override - public List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { - try{ - currenttip.add(BLUE + ITALIC + getEntityMod(entity)); - } catch (Exception e){ - currenttip.add(BLUE + ITALIC + "Unknown"); - } - return currenttip; - } + if (entity instanceof EntityLivingBase) { + String hptip = ""; + + nhearts = nhearts <= 0 ? 20 : nhearts; + + float health = ((EntityLivingBase) entity).getHealth() / 2.0f; + float maxhp = ((EntityLivingBase) entity).getMaxHealth() / 2.0f; + + if (((EntityLivingBase) entity).getMaxHealth() > maxhpfortext) currenttip.add( + String.format( + "HP : " + WHITE + "%.0f" + GRAY + " / " + WHITE + "%.0f", + ((EntityLivingBase) entity).getHealth(), + ((EntityLivingBase) entity).getMaxHealth())); + + else { + currenttip.add( + getRenderString( + "waila.health", + String.valueOf(nhearts), + String.valueOf(health), + String.valueOf(maxhp))); + } + } + + return currenttip; + } + + @Override + public List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, + IWailaConfigHandler config) { + try { + currenttip.add(BLUE + ITALIC + getEntityMod(entity)); + } catch (Exception e) { + currenttip.add(BLUE + ITALIC + "Unknown"); + } + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) { + return tag; + } + + private static String getEntityMod(Entity entity) { + String modName = ""; + try { + EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), true); + ModContainer modC = er.getContainer(); + modName = modC.getName(); + } catch (NullPointerException e) { + modName = "Minecraft"; + } + return modName; + } - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) { - return tag; - } - - private static String getEntityMod(Entity entity){ - String modName = ""; - try{ - EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), true); - ModContainer modC = er.getContainer(); - modName = modC.getName(); - } catch (NullPointerException e){ - modName = "Minecraft"; - } - return modName; - } - } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java index 049d1e7..832fdcf 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java @@ -2,15 +2,6 @@ package mcp.mobius.waila.handlers; 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; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; @@ -19,98 +10,117 @@ import mcp.mobius.waila.api.IWailaFMPProvider; import mcp.mobius.waila.api.impl.DataAccessorFMP; import mcp.mobius.waila.api.impl.ModuleRegistrar; +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.world.World; +import net.minecraftforge.common.util.Constants; + +import org.apache.logging.log4j.Level; + public class HUDHandlerFMP implements IWailaDataProvider { - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < list.tagCount(); i++){ - NBTTagCompound subtag = list.getCompoundTagAt(i); - String id = subtag.getString("id"); + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < list.tagCount(); i++) { + NBTTagCompound subtag = list.getCompoundTagAt(i); + String id = subtag.getString("id"); - if (ModuleRegistrar.instance().hasHeadFMPProviders(id)){ - DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); - - for (List providersList : ModuleRegistrar.instance().getHeadFMPProviders(id).values()){ - for (IWailaFMPProvider provider : providersList) - currenttip = provider.getWailaHead(itemStack, currenttip, DataAccessorFMP.instance, config); - } - } - } - - return currenttip; - } + if (ModuleRegistrar.instance().hasHeadFMPProviders(id)) { + DataAccessorFMP.instance + .set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < list.tagCount(); i++){ - NBTTagCompound subtag = list.getCompoundTagAt(i); - String id = subtag.getString("id"); + for (List providersList : ModuleRegistrar.instance().getHeadFMPProviders(id) + .values()) { + for (IWailaFMPProvider provider : providersList) + currenttip = provider.getWailaHead(itemStack, currenttip, DataAccessorFMP.instance, config); + } + } + } - if (ModuleRegistrar.instance().hasBodyFMPProviders(id)){ - DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); - - for (List providersList : ModuleRegistrar.instance().getBodyFMPProviders(id).values()){ - for (IWailaFMPProvider provider : providersList) - currenttip = provider.getWailaBody(itemStack, currenttip, DataAccessorFMP.instance, config); - } - } - } - - return currenttip; - } + return currenttip; + } - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < list.tagCount(); i++){ - NBTTagCompound subtag = list.getCompoundTagAt(i); - String id = subtag.getString("id"); + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < list.tagCount(); i++) { + NBTTagCompound subtag = list.getCompoundTagAt(i); + String id = subtag.getString("id"); - if (ModuleRegistrar.instance().hasTailFMPProviders(id)){ - DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); - - for (List providersList : ModuleRegistrar.instance().getTailFMPProviders(id).values()){ - for (IWailaFMPProvider provider : providersList) - currenttip = provider.getWailaTail(itemStack, currenttip, DataAccessorFMP.instance, config); - } - } - } - - return currenttip; - } + if (ModuleRegistrar.instance().hasBodyFMPProviders(id)) { + DataAccessorFMP.instance + .set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); - @Override - 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; - } - - public static void register(){ - Class BlockMultipart = null; - try{ - BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); - } catch (ClassNotFoundException e){ - Waila.log.log(Level.WARN, "[FMP] Class not found. " + e); - return; - } catch (Exception e){ - Waila.log.log(Level.WARN, "[FMP] Unhandled exception." + e); - return; - } + for (List providersList : ModuleRegistrar.instance().getBodyFMPProviders(id) + .values()) { + for (IWailaFMPProvider provider : providersList) + currenttip = provider.getWailaBody(itemStack, currenttip, DataAccessorFMP.instance, config); + } + } + } - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerFMP(), BlockMultipart); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFMP(), BlockMultipart); - ModuleRegistrar.instance().registerTailProvider(new HUDHandlerFMP(), BlockMultipart); - ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerFMP(), BlockMultipart); - - Waila.log.log(Level.INFO, "Forge Multipart found and dedicated handler registered"); - - } + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < list.tagCount(); i++) { + NBTTagCompound subtag = list.getCompoundTagAt(i); + String id = subtag.getString("id"); + + if (ModuleRegistrar.instance().hasTailFMPProviders(id)) { + DataAccessorFMP.instance + .set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); + + for (List providersList : ModuleRegistrar.instance().getTailFMPProviders(id) + .values()) { + for (IWailaFMPProvider provider : providersList) + currenttip = provider.getWailaTail(itemStack, currenttip, DataAccessorFMP.instance, config); + } + } + } + + return currenttip; + } + + @Override + 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; + } + + public static void register() { + Class BlockMultipart = null; + try { + BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARN, "[FMP] Class not found. " + e); + return; + } catch (Exception e) { + Waila.log.log(Level.WARN, "[FMP] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerTailProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerFMP(), BlockMultipart); + + Waila.log.log(Level.INFO, "Forge Multipart found and dedicated handler registered"); + + } } diff --git a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java index fc427ff..d84a979 100644 --- a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java +++ b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java @@ -1,17 +1,19 @@ package mcp.mobius.waila.handlers; import mcp.mobius.waila.utils.ModIdentification; + import net.minecraftforge.event.entity.player.ItemTooltipEvent; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class VanillaTooltipHandler { - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void tooltipEvent(ItemTooltipEvent event) { - String canonicalName = ModIdentification.nameFromStack(event.itemStack); - if (canonicalName != null && !canonicalName.equals("")) - event.toolTip.add("\u00a79\u00a7o" + canonicalName); - } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void tooltipEvent(ItemTooltipEvent event) { + String canonicalName = ModIdentification.nameFromStack(event.itemStack); + if (canonicalName != null && !canonicalName.equals("")) event.toolTip.add("\u00a79\u00a7o" + canonicalName); + } } diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java index 06fa5f0..d120f58 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java @@ -5,138 +5,139 @@ import java.util.Map; import mcp.mobius.waila.gui.screens.info.ScreenEnchants; import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.ModIdentification; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; + import codechicken.nei.NEIClientConfig; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; public class HandlerEnchants implements IContainerInputHandler { - @Override - public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) { return false; } + @Override + public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) { + return false; + } - @Override - public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) { } + @Override + public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {} - @Override - public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) { - GuiContainerManager.getManager(); - ItemStack stackover = GuiContainerManager.getStackMouseOver(gui); - if(stackover == null) - return false; - - if(keyID == NEIClientConfig.getKeyBinding(Constants.BIND_SCREEN_ENCH)){ - //try{ - int itemEnchantability = stackover.getItem().getItemEnchantability(); - if (itemEnchantability == 0){return false;} - - Minecraft mc = Minecraft.getMinecraft(); - ScreenEnchants screen = new ScreenEnchants(mc.currentScreen); - screen.setStack(stackover); - screen.setName(stackover.getDisplayName()); - screen.setEnchantability(String.valueOf(itemEnchantability)); - - Enchantment[] enchants = null; - if (stackover.getItem() == Items.book) - enchants = Enchantment.enchantmentsBookList; - else - enchants = Enchantment.enchantmentsList; - - for(Enchantment enchant : enchants){ - boolean isCompatible = true; - int level = 0; - boolean isApplied = false; - - if (enchant == null){continue;} - if (enchant.canApplyAtEnchantingTable(stackover) || stackover.getItem() == Items.book){ - - if (stackover.isItemEnchanted()){ - Map stackenchants = EnchantmentHelper.getEnchantments(stackover); - for (Object id : stackenchants.keySet()){ - if (!enchant.canApplyTogether(Enchantment.enchantmentsList[(Integer)id])) - isCompatible = false; - if ((Integer)id == enchant.effectId){ - isApplied = true; - level = (Integer)stackenchants.get(id); - } - } - } - - for (int lvl = enchant.getMinLevel(); lvl <= enchant.getMaxLevel(); lvl++){ - int minEnchantEnchantability = enchant.getMinEnchantability(lvl); - int maxEnchantEnchantability = enchant.getMaxEnchantability(lvl); - - int minItemEnchantability = 1; - int meanItemEnchantability = 1 + itemEnchantability/4; - int maxItemEnchantability = 1 + itemEnchantability/2; - - int minModifiedEnchantability = (int)(0.85*minItemEnchantability + 0.5); - int meanModifiedEnchantability = (int)(1.00*meanItemEnchantability + 0.5); - int maxModifiedEnchantability = (int)(1.15*maxItemEnchantability + 0.5); - - int minLevel = (int) ((minEnchantEnchantability - minModifiedEnchantability)/1.15); - int maxLevel = (int) ((maxEnchantEnchantability - maxModifiedEnchantability)/0.85); - - int meanMinLevel = (int) ((minEnchantEnchantability - meanModifiedEnchantability)/1.0); - int meanMaxLevel = (int) ((maxEnchantEnchantability - meanModifiedEnchantability)/1.0); - - String colorcode = isCompatible ? "\u00a7f" : "\u00a7c"; - - if (isApplied && lvl == level) - colorcode = "\u00a7e"; - - screen.addRow(colorcode + enchant.getTranslatedName(lvl), - colorcode + String.valueOf(minLevel), - colorcode + String.valueOf(maxLevel), - colorcode + String.valueOf(enchant.getWeight()), - "\u00a79\u00a7o"+ ModIdentification.nameFromObject(enchant)); - } - } - } - mc.displayGuiScreen(screen); - } - - return false; - } + @Override + public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) { + GuiContainerManager.getManager(); + ItemStack stackover = GuiContainerManager.getStackMouseOver(gui); + if (stackover == null) return false; - /* - public String getEnchantModName(Enchantment enchant){ - String enchantPath = enchant.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); - - //mod_Waila.log.log(Level.INFO, enchantPath); - - String enchantModName = ""; - for (String s: mod_Waila.instance.modSourceList.keySet()) - if (enchantPath.contains(s)) - enchantModName = mod_Waila.instance.modSourceList.get(s); - - if (enchantModName.equals("Minecraft Coder Pack")) - enchantModName = "Minecraft"; - return enchantModName; - } - */ - - @Override - public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) { return false; } + if (keyID == NEIClientConfig.getKeyBinding(Constants.BIND_SCREEN_ENCH)) { + // try{ + int itemEnchantability = stackover.getItem().getItemEnchantability(); + if (itemEnchantability == 0) { + return false; + } - @Override - public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) { } + Minecraft mc = Minecraft.getMinecraft(); + ScreenEnchants screen = new ScreenEnchants(mc.currentScreen); + screen.setStack(stackover); + screen.setName(stackover.getDisplayName()); + screen.setEnchantability(String.valueOf(itemEnchantability)); - @Override - public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) { } + Enchantment[] enchants = null; + if (stackover.getItem() == Items.book) enchants = Enchantment.enchantmentsBookList; + else enchants = Enchantment.enchantmentsList; - @Override - public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { return false; } + for (Enchantment enchant : enchants) { + boolean isCompatible = true; + int level = 0; + boolean isApplied = false; - @Override - public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { } + if (enchant == null) { + continue; + } + if (enchant.canApplyAtEnchantingTable(stackover) || stackover.getItem() == Items.book) { - @Override - public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) { } + if (stackover.isItemEnchanted()) { + Map stackenchants = EnchantmentHelper.getEnchantments(stackover); + for (Object id : stackenchants.keySet()) { + if (!enchant.canApplyTogether(Enchantment.enchantmentsList[(Integer) id])) + isCompatible = false; + if ((Integer) id == enchant.effectId) { + isApplied = true; + level = (Integer) stackenchants.get(id); + } + } + } + + for (int lvl = enchant.getMinLevel(); lvl <= enchant.getMaxLevel(); lvl++) { + int minEnchantEnchantability = enchant.getMinEnchantability(lvl); + int maxEnchantEnchantability = enchant.getMaxEnchantability(lvl); + + int minItemEnchantability = 1; + int meanItemEnchantability = 1 + itemEnchantability / 4; + int maxItemEnchantability = 1 + itemEnchantability / 2; + + int minModifiedEnchantability = (int) (0.85 * minItemEnchantability + 0.5); + int meanModifiedEnchantability = (int) (1.00 * meanItemEnchantability + 0.5); + int maxModifiedEnchantability = (int) (1.15 * maxItemEnchantability + 0.5); + + int minLevel = (int) ((minEnchantEnchantability - minModifiedEnchantability) / 1.15); + int maxLevel = (int) ((maxEnchantEnchantability - maxModifiedEnchantability) / 0.85); + + int meanMinLevel = (int) ((minEnchantEnchantability - meanModifiedEnchantability) / 1.0); + int meanMaxLevel = (int) ((maxEnchantEnchantability - meanModifiedEnchantability) / 1.0); + + String colorcode = isCompatible ? "\u00a7f" : "\u00a7c"; + + if (isApplied && lvl == level) colorcode = "\u00a7e"; + + screen.addRow( + colorcode + enchant.getTranslatedName(lvl), + colorcode + String.valueOf(minLevel), + colorcode + String.valueOf(maxLevel), + colorcode + String.valueOf(enchant.getWeight()), + "\u00a79\u00a7o" + ModIdentification.nameFromObject(enchant)); + } + } + } + mc.displayGuiScreen(screen); + } + + return false; + } + + /* + * public String getEnchantModName(Enchantment enchant){ String enchantPath = + * enchant.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); + * //mod_Waila.log.log(Level.INFO, enchantPath); String enchantModName = ""; for (String s: + * mod_Waila.instance.modSourceList.keySet()) if (enchantPath.contains(s)) enchantModName = + * mod_Waila.instance.modSourceList.get(s); if (enchantModName.equals("Minecraft Coder Pack")) enchantModName = + * "Minecraft"; return enchantModName; } + */ + + @Override + public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) { + return false; + } + + @Override + public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {} + + @Override + public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {} + + @Override + public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { + return false; + } + + @Override + public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {} + + @Override + public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {} } diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/ModNameFilter.java b/src/main/java/mcp/mobius/waila/handlers/nei/ModNameFilter.java index 5d0beb2..ade49c5 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/ModNameFilter.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/ModNameFilter.java @@ -1,47 +1,41 @@ package mcp.mobius.waila.handlers.nei; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; -import mcp.mobius.waila.Waila; import mcp.mobius.waila.utils.ModIdentification; + import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import codechicken.nei.NEIClientConfig; + import codechicken.nei.SearchField; import codechicken.nei.SearchField.ISearchProvider; import codechicken.nei.api.ItemFilter; -import codechicken.nei.api.ItemInfo; -public class ModNameFilter implements ISearchProvider{ +public class ModNameFilter implements ISearchProvider { - @Override - public ItemFilter getFilter(String searchText) { - Pattern pattern = SearchField.getPattern(searchText); - return pattern == null ? null : new Filter(pattern); - } + @Override + public ItemFilter getFilter(String searchText) { + Pattern pattern = SearchField.getPattern(searchText); + return pattern == null ? null : new Filter(pattern); + } - @Override - public boolean isPrimary() { - return false; - } + @Override + public boolean isPrimary() { + return false; + } - public static class Filter implements ItemFilter { + public static class Filter implements ItemFilter { - Pattern pattern; - - public Filter(Pattern pattern) { - this.pattern = pattern; - } - - @Override - public boolean matches(ItemStack itemstack) { - return this.pattern.matcher(ModIdentification.nameFromStack(itemstack).toLowerCase()).find(); - } - - } - -} \ No newline at end of file + Pattern pattern; + + public Filter(Pattern pattern) { + this.pattern = pattern; + } + + @Override + public boolean matches(ItemStack itemstack) { + return this.pattern.matcher(ModIdentification.nameFromStack(itemstack).toLowerCase()).find(); + } + + } + +} diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java b/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java index 1b3345c..b9cd28e 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java @@ -6,6 +6,7 @@ import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.cbcore.LangUtil; 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; @@ -23,65 +24,72 @@ import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; public class NEIHandler { - public static void register(){ - //GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila()); - if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, true)){ - API.addSearchProvider(new ModNameFilter()); - API.addSearchProvider(new OreDictFilter()); - } - - GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila()); - - //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); - - //API.addKeyBind(Constants.BIND_WIKI, "Display wiki", Keyboard.KEY_RSHIFT); - //API.addKeyBind(Constants.BIND_TECH, "Display techtree", Keyboard.KEY_RSHIFT); - - GuiContainerManager.addInputHandler(new HandlerEnchants()); - API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I); - } - - public static boolean firstInventory = true; - public static void openRecipeGUI(boolean recipe){ - Minecraft mc = Minecraft.getMinecraft(); - boolean uiResult; - String msg; - - if ((RayTracing.instance().getTarget() != null) && (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)){ - List stacks = RayTracing.instance().getIdentifierItems(); - if (stacks.size() > 0){ - mc.displayGuiScreen(new GuiInventory(mc.thePlayer)); - if (firstInventory){ - try {Thread.sleep(1000);} catch (Exception e){}; - firstInventory = false; - } - - if(recipe) - if(!GuiCraftingRecipe.openRecipeGui("item", stacks.get(0).copy())){ - ItemStack target = stacks.get(0).copy(); - target.setItemDamage(0); - if(!GuiCraftingRecipe.openRecipeGui("item", target)){ - mc.thePlayer.addChatMessage(new ChatComponentTranslation("\u00a7f\u00a7o" + LangUtil.translateG("client.msg.norecipe"))); - mc.displayGuiScreen((GuiScreen)null); - mc.setIngameFocus(); - } - } - - if(!recipe) - if(!GuiUsageRecipe.openRecipeGui("item", stacks.get(0).copy())){ - ItemStack target = stacks.get(0).copy(); - target.setItemDamage(0); - if(!GuiUsageRecipe.openRecipeGui("item", target)){ - mc.thePlayer.addChatMessage(new ChatComponentTranslation("\u00a7f\u00a7o" + LangUtil.translateG("client.msg.nousage"))); - mc.displayGuiScreen((GuiScreen)null); - mc.setIngameFocus(); - } - } - } - } - } + + public static void register() { + // GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila()); + if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, true)) { + API.addSearchProvider(new ModNameFilter()); + API.addSearchProvider(new OreDictFilter()); + } + + GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila()); + + // 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); + + // API.addKeyBind(Constants.BIND_WIKI, "Display wiki", Keyboard.KEY_RSHIFT); + // API.addKeyBind(Constants.BIND_TECH, "Display techtree", Keyboard.KEY_RSHIFT); + + GuiContainerManager.addInputHandler(new HandlerEnchants()); + API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I); + } + + public static boolean firstInventory = true; + + public static void openRecipeGUI(boolean recipe) { + Minecraft mc = Minecraft.getMinecraft(); + boolean uiResult; + String msg; + + if ((RayTracing.instance().getTarget() != null) + && (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)) { + List stacks = RayTracing.instance().getIdentifierItems(); + if (stacks.size() > 0) { + mc.displayGuiScreen(new GuiInventory(mc.thePlayer)); + if (firstInventory) { + try { + Thread.sleep(1000); + } catch (Exception e) {} ; + firstInventory = false; + } + + if (recipe) if (!GuiCraftingRecipe.openRecipeGui("item", stacks.get(0).copy())) { + ItemStack target = stacks.get(0).copy(); + target.setItemDamage(0); + if (!GuiCraftingRecipe.openRecipeGui("item", target)) { + mc.thePlayer.addChatMessage( + new ChatComponentTranslation( + "\u00a7f\u00a7o" + LangUtil.translateG("client.msg.norecipe"))); + mc.displayGuiScreen((GuiScreen) null); + mc.setIngameFocus(); + } + } + + if (!recipe) if (!GuiUsageRecipe.openRecipeGui("item", stacks.get(0).copy())) { + ItemStack target = stacks.get(0).copy(); + target.setItemDamage(0); + if (!GuiUsageRecipe.openRecipeGui("item", target)) { + mc.thePlayer.addChatMessage( + new ChatComponentTranslation( + "\u00a7f\u00a7o" + LangUtil.translateG("client.msg.nousage"))); + mc.displayGuiScreen((GuiScreen) null); + mc.setIngameFocus(); + } + } + } + } + } } diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/OreDictFilter.java b/src/main/java/mcp/mobius/waila/handlers/nei/OreDictFilter.java index 7af9d87..c01c8a7 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/OreDictFilter.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/OreDictFilter.java @@ -4,43 +4,44 @@ import java.util.regex.Pattern; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; + import codechicken.nei.SearchField; import codechicken.nei.SearchField.ISearchProvider; import codechicken.nei.api.ItemFilter; -public class OreDictFilter implements ISearchProvider{ +public class OreDictFilter implements ISearchProvider { - @Override - public ItemFilter getFilter(String searchText) { - if (!searchText.startsWith("#") || searchText.length() < 2) return null; - Pattern pattern = SearchField.getPattern(searchText.substring(1)); - return pattern == null ? null : new Filter(pattern); - } + @Override + public ItemFilter getFilter(String searchText) { + if (!searchText.startsWith("#") || searchText.length() < 2) return null; + Pattern pattern = SearchField.getPattern(searchText.substring(1)); + return pattern == null ? null : new Filter(pattern); + } - @Override - public boolean isPrimary() { - return true; - } + @Override + public boolean isPrimary() { + return true; + } - public static class Filter implements ItemFilter { + public static class Filter implements ItemFilter { - Pattern pattern; - - public Filter(Pattern pattern) { - this.pattern = pattern; - } - - @Override - public boolean matches(ItemStack itemstack) { - int[] ids = OreDictionary.getOreIDs(itemstack); - boolean found = false; - for (int id : ids){ - if (pattern.matcher(OreDictionary.getOreName(id).toLowerCase()).find()){ - found = true; - } - } - return found; - } - - } + Pattern pattern; + + public Filter(Pattern pattern) { + this.pattern = pattern; + } + + @Override + public boolean matches(ItemStack itemstack) { + int[] ids = OreDictionary.getOreIDs(itemstack); + boolean found = false; + for (int id : ids) { + if (pattern.matcher(OreDictionary.getOreName(id).toLowerCase()).find()) { + found = true; + } + } + return found; + } + + } } diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java index 81f0ddb..2423096 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java @@ -2,29 +2,31 @@ package mcp.mobius.waila.handlers.nei; import java.util.List; -import codechicken.nei.guihook.IContainerTooltipHandler; import mcp.mobius.waila.utils.ModIdentification; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; +import codechicken.nei.guihook.IContainerTooltipHandler; + public class TooltipHandlerWaila implements IContainerTooltipHandler { - @Override - public List handleItemDisplayName(GuiContainer arg0, ItemStack itemstack, List currenttip) { - return currenttip; - } + @Override + public List handleItemDisplayName(GuiContainer arg0, ItemStack itemstack, List currenttip) { + return currenttip; + } - @Override - public List handleItemTooltip(GuiContainer arg0, ItemStack itemstack, int arg2, int arg3, List currenttip) { - String canonicalName = ModIdentification.nameFromStack(itemstack); - if (canonicalName != null && !canonicalName.equals("")) - currenttip.add("\u00a79\u00a7o" + canonicalName); - return currenttip; - } + @Override + public List handleItemTooltip(GuiContainer arg0, ItemStack itemstack, int arg2, int arg3, + List currenttip) { + String canonicalName = ModIdentification.nameFromStack(itemstack); + if (canonicalName != null && !canonicalName.equals("")) currenttip.add("\u00a79\u00a7o" + canonicalName); + return currenttip; + } - @Override - public List handleTooltip(GuiContainer arg0, int arg1, int arg2, List currenttip) { - return currenttip; - } + @Override + public List handleTooltip(GuiContainer arg0, int arg1, int arg2, List currenttip) { + return currenttip; + } } diff --git a/src/main/java/mcp/mobius/waila/network/IWailaMessage.java b/src/main/java/mcp/mobius/waila/network/IWailaMessage.java index fa94900..6d66b45 100644 --- a/src/main/java/mcp/mobius/waila/network/IWailaMessage.java +++ b/src/main/java/mcp/mobius/waila/network/IWailaMessage.java @@ -4,6 +4,8 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; public interface IWailaMessage { - public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception; - public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg); + + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception; + + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg); } diff --git a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java index e12d965..f0bf262 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java @@ -2,60 +2,61 @@ package mcp.mobius.waila.network; import java.util.HashMap; -import net.minecraftforge.common.config.ConfigCategory; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.WailaExceptionHandler; + +import net.minecraftforge.common.config.ConfigCategory; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; public class Message0x00ServerPing extends SimpleChannelInboundHandler implements IWailaMessage { - HashMap forcedKeys = new HashMap(); - - public Message0x00ServerPing(){ - ConfigCategory serverForcingCfg = ConfigHandler.instance().config.getCategory(Constants.CATEGORY_SERVER); - - for (String key : serverForcingCfg.keySet()){ - if (serverForcingCfg.get(key).getBoolean(false)){ - forcedKeys.put(key, ConfigHandler.instance().getConfig(key)); - } - } - } - - @Override - public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { - target.writeShort(this.forcedKeys.keySet().size()); - for (String key : forcedKeys.keySet()){ - WailaPacketHandler.INSTANCE.writeString(target, key); - target.writeBoolean(this.forcedKeys.get(key)); - } - } + HashMap forcedKeys = new HashMap(); - @Override - public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { - try{ - int nkeys = dat.readShort(); - for (int i = 0; i < nkeys; i++){ - this.forcedKeys.put(WailaPacketHandler.INSTANCE.readString(dat), dat.readBoolean()); - } - }catch (Exception e){ - WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); - } - - } + public Message0x00ServerPing() { + ConfigCategory serverForcingCfg = ConfigHandler.instance().config.getCategory(Constants.CATEGORY_SERVER); - @Override - protected void channelRead0(ChannelHandlerContext ctx, Message0x00ServerPing msg) throws Exception { - Waila.log.info("Received server authentication msg. Remote sync will be activated"); - Waila.instance.serverPresent = true; - - for (String key : msg.forcedKeys.keySet()) - Waila.log.info(String.format("Received forced key config %s : %s", key, msg.forcedKeys.get(key))); - - ConfigHandler.instance().forcedConfigs = msg.forcedKeys; - } + for (String key : serverForcingCfg.keySet()) { + if (serverForcingCfg.get(key).getBoolean(false)) { + forcedKeys.put(key, ConfigHandler.instance().getConfig(key)); + } + } + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + target.writeShort(this.forcedKeys.keySet().size()); + for (String key : forcedKeys.keySet()) { + WailaPacketHandler.INSTANCE.writeString(target, key); + target.writeBoolean(this.forcedKeys.get(key)); + } + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { + try { + int nkeys = dat.readShort(); + for (int i = 0; i < nkeys; i++) { + this.forcedKeys.put(WailaPacketHandler.INSTANCE.readString(dat), dat.readBoolean()); + } + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x00ServerPing msg) throws Exception { + Waila.log.info("Received server authentication msg. Remote sync will be activated"); + Waila.instance.serverPresent = true; + + for (String key : msg.forcedKeys.keySet()) + Waila.log.info(String.format("Received forced key config %s : %s", key, msg.forcedKeys.get(key))); + + ConfigHandler.instance().forcedConfigs = msg.forcedKeys; + } } - diff --git a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java index 04e4bf6..38d71e4 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java @@ -1,159 +1,158 @@ package mcp.mobius.waila.network; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.utils.AccessHelper; -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; -import net.minecraftforge.common.DimensionManager; - import java.lang.reflect.Field; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.AccessHelper; +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.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; + +import cpw.mods.fml.common.network.NetworkRegistry; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + public class Message0x01TERequest extends SimpleChannelInboundHandler implements IWailaMessage { - - private static Field classToNameMap = null; - - static{ - try{ - classToNameMap = TileEntity.class.getDeclaredField("classToNameMap"); - classToNameMap.setAccessible(true); - } catch (Exception e){ - - try{ - classToNameMap = TileEntity.class.getDeclaredField("field_145853_j"); - classToNameMap.setAccessible(true); - } catch (Exception f){ - throw new RuntimeException(f); - } - - } - } - - public int dim; - public int posX; - public int posY; - public int posZ; - public HashSet keys = new HashSet (); - - public Message0x01TERequest(){} - - public Message0x01TERequest(TileEntity ent, HashSet keys){ - this.dim = ent.getWorldObj().provider.dimensionId; - this.posX = ent.xCoord; - this.posY = ent.yCoord; - this.posZ = ent.zCoord; - this.keys = keys; - } - - @Override - public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { - target.writeInt(dim); - target.writeInt(posX); - target.writeInt(posY); - target.writeInt(posZ); - target.writeInt(this.keys.size()); - - for (String key : keys) - WailaPacketHandler.INSTANCE.writeString(target, key); - } - @Override - public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { - try{ - Message0x01TERequest msg = (Message0x01TERequest)rawmsg; - msg.dim = dat.readInt(); - msg.posX = dat.readInt(); - msg.posY = dat.readInt(); - msg.posZ = dat.readInt(); - - int nkeys = dat.readInt(); - - for (int i = 0; i < nkeys; i++) - this.keys.add(WailaPacketHandler.INSTANCE.readString(dat)); - - }catch (Exception e){ - WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); - } - } + private static Field classToNameMap = null; + + static { + try { + classToNameMap = TileEntity.class.getDeclaredField("classToNameMap"); + classToNameMap.setAccessible(true); + } catch (Exception e) { + + try { + classToNameMap = TileEntity.class.getDeclaredField("field_145853_j"); + classToNameMap.setAccessible(true); + } catch (Exception f) { + throw new RuntimeException(f); + } + + } + } + + public int dim; + public int posX; + public int posY; + public int posZ; + public HashSet keys = new HashSet(); + + public Message0x01TERequest() {} + + public Message0x01TERequest(TileEntity ent, HashSet keys) { + this.dim = ent.getWorldObj().provider.dimensionId; + this.posX = ent.xCoord; + this.posY = ent.yCoord; + this.posZ = ent.zCoord; + this.keys = keys; + } - @SuppressWarnings("rawtypes") @Override - protected void channelRead0(ChannelHandlerContext ctx, Message0x01TERequest msg) throws Exception { - World world = DimensionManager.getWorld(msg.dim); - if(world == null) return; - TileEntity entity = world.getTileEntity(msg.posX, msg.posY, msg.posZ); - Block block = world.getBlock(msg.posX, msg.posY, msg.posZ); - if(entity == null) return; - try{ - NBTTagCompound tag = new NBTTagCompound(); - boolean hasNBTBlock = ModuleRegistrar.instance().hasNBTProviders(block); - boolean hasNBTEnt = ModuleRegistrar.instance().hasNBTProviders(entity); + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + target.writeInt(dim); + target.writeInt(posX); + target.writeInt(posY); + target.writeInt(posZ); + target.writeInt(this.keys.size()); - if (hasNBTBlock || hasNBTEnt){ + for (String key : keys) WailaPacketHandler.INSTANCE.writeString(target, key); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { + try { + Message0x01TERequest msg = (Message0x01TERequest) rawmsg; + msg.dim = dat.readInt(); + msg.posX = dat.readInt(); + msg.posY = dat.readInt(); + msg.posZ = dat.readInt(); + + int nkeys = dat.readInt(); + + for (int i = 0; i < nkeys; i++) this.keys.add(WailaPacketHandler.INSTANCE.readString(dat)); + + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + } + + @SuppressWarnings("rawtypes") + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x01TERequest msg) throws Exception { + World world = DimensionManager.getWorld(msg.dim); + if (world == null) return; + TileEntity entity = world.getTileEntity(msg.posX, msg.posY, msg.posZ); + Block block = world.getBlock(msg.posX, msg.posY, msg.posZ); + if (entity == null) return; + try { + NBTTagCompound tag = new NBTTagCompound(); + boolean hasNBTBlock = ModuleRegistrar.instance().hasNBTProviders(block); + boolean hasNBTEnt = ModuleRegistrar.instance().hasNBTProviders(entity); + + if (hasNBTBlock || hasNBTEnt) { tag.setInteger("x", msg.posX); tag.setInteger("y", msg.posY); tag.setInteger("z", msg.posZ); - tag.setString ("id", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass())); - - EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity; - - for (List providersList : ModuleRegistrar.instance().getNBTProviders(block).values()){ - for (IWailaDataProvider provider : providersList){ - try{ + tag.setString("id", (String) ((HashMap) classToNameMap.get(null)).get(entity.getClass())); + + EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER) + .get()).playerEntity; + + for (List providersList : ModuleRegistrar.instance().getNBTProviders(block) + .values()) { + for (IWailaDataProvider provider : providersList) { + try { tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ); - } catch (AbstractMethodError ame){ + } catch (AbstractMethodError ame) { + tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); + } catch (NoSuchMethodError nsm) { tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); - } catch (NoSuchMethodError nsm){ - tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); } } } - - - for (List providersList : ModuleRegistrar.instance().getNBTProviders(entity).values()){ - for (IWailaDataProvider provider : providersList){ - try{ + + for (List providersList : ModuleRegistrar.instance().getNBTProviders(entity) + .values()) { + for (IWailaDataProvider provider : providersList) { + try { tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ); - } catch (AbstractMethodError ame){ + } catch (AbstractMethodError ame) { + tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); + } catch (NoSuchMethodError nsm) { tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); - } catch (NoSuchMethodError nsm){ - tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); } } } - + } else { entity.writeToNBT(tag); tag = NBTUtil.createTag(tag, msg.keys); } - + tag.setInteger("WailaX", msg.posX); tag.setInteger("WailaY", msg.posY); tag.setInteger("WailaZ", msg.posZ); - tag.setString ("WailaID", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass())); + tag.setString("WailaID", (String) ((HashMap) classToNameMap.get(null)).get(entity.getClass())); WailaPacketHandler.INSTANCE.sendTo(new Message0x02TENBTData(tag), WailaPacketHandler.getPlayer(ctx)); - //ctx.writeAndFlush(new Message0x02TENBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); - }catch(Throwable e){ + // ctx.writeAndFlush(new + // Message0x02TENBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); + } catch (Throwable e) { WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null); } - - - } -} + } +} diff --git a/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java b/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java index 263808b..b8dd827 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java @@ -2,39 +2,39 @@ package mcp.mobius.waila.network; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.utils.WailaExceptionHandler; + import net.minecraft.nbt.NBTTagCompound; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; - public class Message0x02TENBTData extends SimpleChannelInboundHandler implements IWailaMessage { - - NBTTagCompound tag; - - public Message0x02TENBTData(){} - - public Message0x02TENBTData(NBTTagCompound tag){ - this.tag = tag; - } - - @Override - public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { - WailaPacketHandler.INSTANCE.writeNBT(target, tag); - } - @Override - public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) { - try{ - this.tag = WailaPacketHandler.INSTANCE.readNBT(dat); - } catch (Exception e){ - WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); - } - } + NBTTagCompound tag; - @Override - protected void channelRead0(ChannelHandlerContext ctx, Message0x02TENBTData msg) throws Exception { - DataAccessorCommon.instance.setNBTData(msg.tag); - } + public Message0x02TENBTData() {} + + public Message0x02TENBTData(NBTTagCompound tag) { + this.tag = tag; + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + WailaPacketHandler.INSTANCE.writeNBT(target, tag); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) { + try { + this.tag = WailaPacketHandler.INSTANCE.readNBT(dat); + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x02TENBTData msg) throws Exception { + DataAccessorCommon.instance.setNBTData(msg.tag); + } } - diff --git a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java index 1299295..2cdf388 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java @@ -3,15 +3,12 @@ package mcp.mobius.waila.network; import java.util.HashSet; import java.util.List; -import cpw.mods.fml.common.network.NetworkRegistry; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; import mcp.mobius.waila.api.IWailaEntityProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.utils.AccessHelper; import mcp.mobius.waila.utils.NBTUtil; import mcp.mobius.waila.utils.WailaExceptionHandler; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; @@ -19,67 +16,71 @@ import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import cpw.mods.fml.common.network.NetworkRegistry; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + public class Message0x03EntRequest extends SimpleChannelInboundHandler implements IWailaMessage { - public int dim; - public int id; - public HashSet keys = new HashSet (); - - public Message0x03EntRequest(){} - - public Message0x03EntRequest(Entity ent, HashSet keys){ - this.dim = ent.worldObj.provider.dimensionId; - this.id = ent.getEntityId(); - this.keys = keys; - } - - @Override - public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { - target.writeInt(dim); - target.writeInt(id); - target.writeInt(this.keys.size()); - - for (String key : keys) - WailaPacketHandler.INSTANCE.writeString(target, key); - } + public int dim; + public int id; + public HashSet keys = new HashSet(); - @Override - public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { - try{ - Message0x03EntRequest msg = (Message0x03EntRequest)rawmsg; - msg.dim = dat.readInt(); - msg.id = dat.readInt(); + public Message0x03EntRequest() {} - - int nkeys = dat.readInt(); - - for (int i = 0; i < nkeys; i++) - this.keys.add(WailaPacketHandler.INSTANCE.readString(dat)); - - }catch (Exception e){ - WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); - } - } + public Message0x03EntRequest(Entity ent, HashSet keys) { + this.dim = ent.worldObj.provider.dimensionId; + this.id = ent.getEntityId(); + this.keys = keys; + } - @Override - protected void channelRead0(ChannelHandlerContext ctx, Message0x03EntRequest msg) throws Exception { - World world = DimensionManager.getWorld(msg.dim); - if(world == null) return; + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + target.writeInt(dim); + target.writeInt(id); + target.writeInt(this.keys.size()); + + for (String key : keys) WailaPacketHandler.INSTANCE.writeString(target, key); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { + try { + Message0x03EntRequest msg = (Message0x03EntRequest) rawmsg; + msg.dim = dat.readInt(); + msg.id = dat.readInt(); + + int nkeys = dat.readInt(); + + for (int i = 0; i < nkeys; i++) this.keys.add(WailaPacketHandler.INSTANCE.readString(dat)); + + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x03EntRequest msg) throws Exception { + World world = DimensionManager.getWorld(msg.dim); + if (world == null) return; Entity entity = world.getEntityByID(msg.id); - if(entity == null) return; - try{ + if (entity == null) return; + try { NBTTagCompound tag = new NBTTagCompound(); - - EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity; - - if (ModuleRegistrar.instance().hasNBTEntityProviders(entity)){ - for (List providersList : ModuleRegistrar.instance().getNBTEntityProviders(entity).values()){ - for (IWailaEntityProvider provider : providersList){ - try{ + + EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER) + .get()).playerEntity; + + if (ModuleRegistrar.instance().hasNBTEntityProviders(entity)) { + for (List providersList : ModuleRegistrar.instance().getNBTEntityProviders(entity) + .values()) { + for (IWailaEntityProvider provider : providersList) { + try { tag = provider.getNBTData(player, entity, tag, world); - } catch (AbstractMethodError ame){ + } catch (AbstractMethodError ame) { tag = AccessHelper.getNBTData(provider, entity, tag); - } + } } } @@ -87,14 +88,15 @@ public class Message0x03EntRequest extends SimpleChannelInboundHandler implements IWailaMessage { - NBTTagCompound tag; - - public Message0x04EntNBTData(){} - - public Message0x04EntNBTData(NBTTagCompound tag){ - this.tag = tag; - } - - @Override - public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { - WailaPacketHandler.INSTANCE.writeNBT(target, tag); - } + NBTTagCompound tag; - @Override - public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) { - try{ - this.tag = WailaPacketHandler.INSTANCE.readNBT(dat); - } catch (Exception e){ - WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); - } - } + public Message0x04EntNBTData() {} - @Override - protected void channelRead0(ChannelHandlerContext ctx, Message0x04EntNBTData msg) throws Exception { - DataAccessorCommon.instance.setNBTData(msg.tag); - } + public Message0x04EntNBTData(NBTTagCompound tag) { + this.tag = tag; + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + WailaPacketHandler.INSTANCE.writeNBT(target, tag); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) { + try { + this.tag = WailaPacketHandler.INSTANCE.readNBT(dat); + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x04EntNBTData msg) throws Exception { + DataAccessorCommon.instance.setNBTData(msg.tag); + } } diff --git a/src/main/java/mcp/mobius/waila/network/NetworkHandler.java b/src/main/java/mcp/mobius/waila/network/NetworkHandler.java index 83ebf64..22f58f2 100644 --- a/src/main/java/mcp/mobius/waila/network/NetworkHandler.java +++ b/src/main/java/mcp/mobius/waila/network/NetworkHandler.java @@ -1,14 +1,17 @@ package mcp.mobius.waila.network; import mcp.mobius.waila.Waila; + 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){ - Waila.log.info(String.format("Player %s connected. Sending ping", event.player)); - WailaPacketHandler.INSTANCE.sendTo(new Message0x00ServerPing(), (EntityPlayerMP)event.player); - } + + @SubscribeEvent + public void onPlayerLoggedIn(PlayerLoggedInEvent event) { + Waila.log.info(String.format("Player %s connected. Sending ping", event.player)); + WailaPacketHandler.INSTANCE.sendTo(new Message0x00ServerPing(), (EntityPlayerMP) event.player); + } } diff --git a/src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java b/src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java index 11b648b..87e48dc 100644 --- a/src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java +++ b/src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java @@ -1,6 +1,16 @@ package mcp.mobius.waila.network; +import java.io.IOException; +import java.util.EnumMap; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTSizeTracker; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetHandlerPlayServer; + import com.google.common.base.Charsets; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; @@ -10,121 +20,108 @@ import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTSizeTracker; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetHandlerPlayServer; - -import java.io.IOException; -import java.util.EnumMap; public enum WailaPacketHandler { - INSTANCE; - - public EnumMap channels; - - private WailaPacketHandler(){ + + INSTANCE; + + public EnumMap channels; + + private WailaPacketHandler() { this.channels = NetworkRegistry.INSTANCE.newChannel("Waila", new WailaCodec()); - if (FMLCommonHandler.instance().getSide() == Side.CLIENT){ + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { addClientHandlers(); - addServerHandlers(); - }else{ - addServerHandlers(); + addServerHandlers(); + } else { + addServerHandlers(); } - + } - private void addClientHandlers(){ + private void addClientHandlers() { FMLEmbeddedChannel channel = this.channels.get(Side.CLIENT); String codec = channel.findChannelHandlerNameForType(WailaCodec.class); - - channel.pipeline().addAfter(codec, "ServerPing", new Message0x00ServerPing()); - channel.pipeline().addAfter("ServerPing", "TENBTData", new Message0x02TENBTData()); - channel.pipeline().addAfter("TENBTData", "EntNBTData", new Message0x04EntNBTData()); + + channel.pipeline().addAfter(codec, "ServerPing", new Message0x00ServerPing()); + channel.pipeline().addAfter("ServerPing", "TENBTData", new Message0x02TENBTData()); + channel.pipeline().addAfter("TENBTData", "EntNBTData", new Message0x04EntNBTData()); } - - private void addServerHandlers(){ + + private void addServerHandlers() { FMLEmbeddedChannel channel = this.channels.get(Side.SERVER); String codec = channel.findChannelHandlerNameForType(WailaCodec.class); - - channel.pipeline().addAfter(codec, "TERequest", new Message0x01TERequest()); + + channel.pipeline().addAfter(codec, "TERequest", new Message0x01TERequest()); channel.pipeline().addAfter("TERequest", "EntRequest", new Message0x03EntRequest()); - } - - private class WailaCodec extends FMLIndexedMessageToMessageCodec - { - public WailaCodec() - { + } + + private class WailaCodec extends FMLIndexedMessageToMessageCodec { + + public WailaCodec() { addDiscriminator(0, Message0x00ServerPing.class); addDiscriminator(1, Message0x01TERequest.class); addDiscriminator(2, Message0x02TENBTData.class); addDiscriminator(3, Message0x03EntRequest.class); addDiscriminator(4, Message0x04EntNBTData.class); } - + @Override - public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception - { - msg.encodeInto(ctx, msg, target); + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + msg.encodeInto(ctx, msg, target); } @Override - public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) - { - msg.decodeInto(ctx, dat, msg); + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) { + msg.decodeInto(ctx, dat, msg); } - } - - public void sendTo(IWailaMessage message, EntityPlayerMP player){ - channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); - channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); - channels.get(Side.SERVER).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); } - - public void sendToServer(IWailaMessage message){ - channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER); + + public void sendTo(IWailaMessage message, EntityPlayerMP player) { + channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.PLAYER); + channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); + channels.get(Side.SERVER).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); + } + + public void sendToServer(IWailaMessage message) { + channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.TOSERVER); channels.get(Side.CLIENT).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); } - - public void writeNBT(ByteBuf target, NBTTagCompound tag) throws IOException{ - if (tag == null) - target.writeShort(-1); - else{ + + public void writeNBT(ByteBuf target, NBTTagCompound tag) throws IOException { + if (tag == null) target.writeShort(-1); + else { byte[] abyte = CompressedStreamTools.compress(tag); - target.writeShort((short)abyte.length); + target.writeShort((short) abyte.length); target.writeBytes(abyte); } } - public NBTTagCompound readNBT(ByteBuf dat) throws IOException - { + public NBTTagCompound readNBT(ByteBuf dat) throws IOException { short short1 = dat.readShort(); - if (short1 < 0) - return null; - else{ + if (short1 < 0) return null; + else { byte[] abyte = new byte[short1]; dat.readBytes(abyte); return CompressedStreamTools.func_152457_a(abyte, NBTSizeTracker.field_152451_a); } } - - public void writeString(ByteBuf buffer, String data) throws IOException - { + + public void writeString(ByteBuf buffer, String data) throws IOException { byte[] abyte = data.getBytes(Charsets.UTF_8); - buffer.writeShort(abyte.length); - buffer.writeBytes(abyte); + buffer.writeShort(abyte.length); + buffer.writeBytes(abyte); } - - public String readString(ByteBuf buffer) throws IOException - { + + public String readString(ByteBuf buffer) throws IOException { int j = buffer.readShort(); String s = new String(buffer.readBytes(j).array(), Charsets.UTF_8); return s; } - public static EntityPlayerMP getPlayer(ChannelHandlerContext ctx){ - return ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity; - } + public static EntityPlayerMP getPlayer(ChannelHandlerContext ctx) { + return ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity; + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java index 155ad63..1163386 100644 --- a/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java +++ b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java @@ -2,16 +2,12 @@ package mcp.mobius.waila.overlay; import java.util.List; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.utils.WailaExceptionHandler; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; @@ -19,50 +15,56 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class DecoratorRenderer { - @SubscribeEvent + @SubscribeEvent @SideOnly(Side.CLIENT) - public void onRenderWorldLast(RenderWorldLastEvent event) { - if (RayTracing.instance().getTarget() == null || RayTracing.instance().getTargetStack() == null) return; - - double partialTicks = event.partialTicks; + public void onRenderWorldLast(RenderWorldLastEvent event) { + if (RayTracing.instance().getTarget() == null || RayTracing.instance().getTargetStack() == null) return; - DataAccessorCommon accessor = DataAccessorCommon.instance; - World world = Minecraft.getMinecraft().theWorld; - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - EntityLivingBase viewEntity = Minecraft.getMinecraft().renderViewEntity; - - if (world == null || player == null || viewEntity == null) return; - - accessor.set(world, player, RayTracing.instance().getTarget(), viewEntity, partialTicks); + double partialTicks = event.partialTicks; - Block block = accessor.getBlock(); + DataAccessorCommon accessor = DataAccessorCommon.instance; + World world = Minecraft.getMinecraft().theWorld; + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityLivingBase viewEntity = Minecraft.getMinecraft().renderViewEntity; + + if (world == null || player == null || viewEntity == null) return; + + accessor.set(world, player, RayTracing.instance().getTarget(), viewEntity, partialTicks); + + Block block = accessor.getBlock(); + + if (!ModuleRegistrar.instance().hasBlockDecorator(block)) return; - if (!ModuleRegistrar.instance().hasBlockDecorator(block)) return; - GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT); GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDepthMask(false); + GL11.glDepthMask(false); + + if (ModuleRegistrar.instance().hasBlockDecorator(block)) { + for (List decoratorsList : ModuleRegistrar.instance().getBlockDecorators(block) + .values()) { + for (IWailaBlockDecorator decorator : decoratorsList) try { + GL11.glPushMatrix(); + decorator.decorateBlock(RayTracing.instance().getTargetStack(), accessor, ConfigHandler.instance()); + GL11.glPopMatrix(); + } catch (Throwable e) { + GL11.glPopMatrix(); + WailaExceptionHandler.handleErr(e, decorator.getClass().toString(), null); + } + } + } - if (ModuleRegistrar.instance().hasBlockDecorator(block)){ - for (List decoratorsList : ModuleRegistrar.instance().getBlockDecorators(block).values()){ - for (IWailaBlockDecorator decorator : decoratorsList) - try{ - GL11.glPushMatrix(); - decorator.decorateBlock(RayTracing.instance().getTargetStack(), accessor, ConfigHandler.instance()); - GL11.glPopMatrix(); - } catch (Throwable e){ - GL11.glPopMatrix(); - WailaExceptionHandler.handleErr(e, decorator.getClass().toString(), null); - } - } - } - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPopAttrib(); + GL11.glPopAttrib(); - } + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java index 71386d2..b976171 100644 --- a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java +++ b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java @@ -6,14 +6,12 @@ import java.awt.Dimension; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.lwjgl.opengl.GL11; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.utils.WailaExceptionHandler; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -23,165 +21,157 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; + +import org.lwjgl.opengl.GL11; public class DisplayUtil { - private static FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - private static TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); - private static RenderItem renderItem = new RenderItem(); - - public static int getDisplayWidth(String s) { - if (s == null || s.equals("")) - return 0; - - int width = 0; - - Matcher renderMatcher = patternRender.matcher(s); - while (renderMatcher.find()){ - IWailaTooltipRenderer renderer = ModuleRegistrar.instance().getTooltipRenderer(renderMatcher.group("name")); - if (renderer != null) - width += renderer.getSize(renderMatcher.group("args").split(","), DataAccessorCommon.instance).width; - } - - Matcher iconMatcher = patternIcon.matcher(s); - while (iconMatcher.find()) - width += 8; - - width += fontRenderer.getStringWidth(stripSymbols(s)); - return width; - } - - public static Dimension displaySize() { - Minecraft mc = Minecraft.getMinecraft(); - ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - return new Dimension(res.getScaledWidth(), res.getScaledHeight()); - } - - public static String stripSymbols(String s){ - String result = patternRender.matcher(s).replaceAll(""); - result = patternMinecraft.matcher(result).replaceAll(""); - result = patternWaila.matcher(result).replaceAll(""); - return result; - } - - public static String stripWailaSymbols(String s){ - String result = patternRender.matcher(s).replaceAll(""); - result = patternWaila.matcher(result).replaceAll(""); - return result; - } - - public static void renderStack(int x, int y, ItemStack stack){ - enable3DRender(); - try{ - renderItem.renderItemAndEffectIntoGUI(fontRenderer, textureManager, stack, x, y); - renderItem.renderItemOverlayIntoGUI(fontRenderer, textureManager, stack, x, y); - } catch (Exception e){ - String stackStr = stack != null ? stack.toString() : "NullStack"; - WailaExceptionHandler.handleErr(e, "renderStack | " + stackStr, null); - } - enable2DRender(); - } - - 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); - } - public static void drawGradientRect(int x, int y, int w, int h, int grad1, int grad2) - { - float zLevel = 0.0f; - - float f = (float)(grad1 >> 24 & 255) / 255.0F; - float f1 = (float)(grad1 >> 16 & 255) / 255.0F; - float f2 = (float)(grad1 >> 8 & 255) / 255.0F; - float f3 = (float)(grad1 & 255) / 255.0F; - float f4 = (float)(grad2 >> 24 & 255) / 255.0F; - float f5 = (float)(grad2 >> 16 & 255) / 255.0F; - float f6 = (float)(grad2 >> 8 & 255) / 255.0F; - float f7 = (float)(grad2 & 255) / 255.0F; - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_ALPHA_TEST); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glShadeModel(GL11.GL_SMOOTH); - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(f1, f2, f3, f); - tessellator.addVertex((double)(x+w), (double)y, (double)zLevel); - tessellator.addVertex((double)x, (double)y, (double)zLevel); - tessellator.setColorRGBA_F(f5, f6, f7, f4); - tessellator.addVertex((double)x, (double)(y+h), (double)zLevel); - tessellator.addVertex((double)(x+w), (double)(y+h), (double)zLevel); - tessellator.draw(); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } + private static FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + private static TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); + private static RenderItem renderItem = new RenderItem(); - public static void drawTexturedModalRect(int x, int y, int u, int v, int w, int h, int tw, int th) - { - float f = 0.00390625F; - float f1 = 0.00390625F; - float zLevel = 0.0F; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setColorOpaque_F(1, 1, 1); - tessellator.addVertexWithUV(x + 0, y + h, zLevel, (u + 0) * f, (v + th) * f1); - tessellator.addVertexWithUV(x + w, y + h, zLevel, (u + tw) * f, (v + th) * f1); - tessellator.addVertexWithUV(x + w, y + 0, zLevel, (u + tw) * f, (v + 0) * f1); - tessellator.addVertexWithUV(x + 0, y + 0, zLevel, (u + 0) * f, (v + 0) * f1); - tessellator.draw(); - } + public static int getDisplayWidth(String s) { + if (s == null || s.equals("")) return 0; - 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); - } + int width = 0; - public static List itemDisplayNameMultiline(ItemStack itemstack) { - List namelist = null; - try { - namelist = itemstack.getTooltip(Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().gameSettings.advancedItemTooltips); - } catch (Throwable ignored) {} - - if (namelist == null) - namelist = new ArrayList(); - - if (namelist.size() == 0) - namelist.add("Unnamed"); - - if (namelist.get(0) == null || namelist.get(0).equals("")) - namelist.set(0, "Unnamed"); - - namelist.set(0, itemstack.getRarity().rarityColor.toString() + namelist.get(0)); - for (int i = 1; i < namelist.size(); i++) - namelist.set(i, "\u00a77" + namelist.get(i)); - - return namelist; - } + Matcher renderMatcher = patternRender.matcher(s); + while (renderMatcher.find()) { + IWailaTooltipRenderer renderer = ModuleRegistrar.instance().getTooltipRenderer(renderMatcher.group("name")); + if (renderer != null) + width += renderer.getSize(renderMatcher.group("args").split(","), DataAccessorCommon.instance).width; + } + + Matcher iconMatcher = patternIcon.matcher(s); + while (iconMatcher.find()) width += 8; + + width += fontRenderer.getStringWidth(stripSymbols(s)); + return width; + } + + public static Dimension displaySize() { + Minecraft mc = Minecraft.getMinecraft(); + ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + return new Dimension(res.getScaledWidth(), res.getScaledHeight()); + } + + public static String stripSymbols(String s) { + String result = patternRender.matcher(s).replaceAll(""); + result = patternMinecraft.matcher(result).replaceAll(""); + result = patternWaila.matcher(result).replaceAll(""); + return result; + } + + public static String stripWailaSymbols(String s) { + String result = patternRender.matcher(s).replaceAll(""); + result = patternWaila.matcher(result).replaceAll(""); + return result; + } + + public static void renderStack(int x, int y, ItemStack stack) { + enable3DRender(); + try { + renderItem.renderItemAndEffectIntoGUI(fontRenderer, textureManager, stack, x, y); + renderItem.renderItemOverlayIntoGUI(fontRenderer, textureManager, stack, x, y); + } catch (Exception e) { + String stackStr = stack != null ? stack.toString() : "NullStack"; + WailaExceptionHandler.handleErr(e, "renderStack | " + stackStr, null); + } + enable2DRender(); + } + + 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); + } + + public static void drawGradientRect(int x, int y, int w, int h, int grad1, int grad2) { + float zLevel = 0.0f; + + float f = (float) (grad1 >> 24 & 255) / 255.0F; + float f1 = (float) (grad1 >> 16 & 255) / 255.0F; + float f2 = (float) (grad1 >> 8 & 255) / 255.0F; + float f3 = (float) (grad1 & 255) / 255.0F; + float f4 = (float) (grad2 >> 24 & 255) / 255.0F; + float f5 = (float) (grad2 >> 16 & 255) / 255.0F; + float f6 = (float) (grad2 >> 8 & 255) / 255.0F; + float f7 = (float) (grad2 & 255) / 255.0F; + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_ALPHA_TEST); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glShadeModel(GL11.GL_SMOOTH); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setColorRGBA_F(f1, f2, f3, f); + tessellator.addVertex((double) (x + w), (double) y, (double) zLevel); + tessellator.addVertex((double) x, (double) y, (double) zLevel); + tessellator.setColorRGBA_F(f5, f6, f7, f4); + tessellator.addVertex((double) x, (double) (y + h), (double) zLevel); + tessellator.addVertex((double) (x + w), (double) (y + h), (double) zLevel); + tessellator.draw(); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } + + public static void drawTexturedModalRect(int x, int y, int u, int v, int w, int h, int tw, int th) { + float f = 0.00390625F; + float f1 = 0.00390625F; + float zLevel = 0.0F; + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setColorOpaque_F(1, 1, 1); + tessellator.addVertexWithUV(x + 0, y + h, zLevel, (u + 0) * f, (v + th) * f1); + tessellator.addVertexWithUV(x + w, y + h, zLevel, (u + tw) * f, (v + th) * f1); + tessellator.addVertexWithUV(x + w, y + 0, zLevel, (u + tw) * f, (v + 0) * f1); + tessellator.addVertexWithUV(x + 0, y + 0, zLevel, (u + 0) * f, (v + 0) * f1); + tessellator.draw(); + } + + 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 List itemDisplayNameMultiline(ItemStack itemstack) { + List namelist = null; + try { + namelist = itemstack.getTooltip( + Minecraft.getMinecraft().thePlayer, + Minecraft.getMinecraft().gameSettings.advancedItemTooltips); + } catch (Throwable ignored) {} + + if (namelist == null) namelist = new ArrayList(); + + if (namelist.size() == 0) namelist.add("Unnamed"); + + if (namelist.get(0) == null || namelist.get(0).equals("")) namelist.set(0, "Unnamed"); + + namelist.set(0, itemstack.getRarity().rarityColor.toString() + namelist.get(0)); + for (int i = 1; i < namelist.size(); i++) namelist.set(i, "\u00a77" + namelist.get(i)); + + return namelist; + } + + public static String itemDisplayNameShort(ItemStack itemstack) { + List list = itemDisplayNameMultiline(itemstack); + return list.get(0); + } + + public static void renderIcon(int x, int y, int sx, int sy, IconUI icon) { + Minecraft.getMinecraft().getTextureManager().bindTexture(Gui.icons); + + if (icon == null) return; + + if (icon.bu != -1) DisplayUtil.drawTexturedModalRect(x, y, icon.bu, icon.bv, sx, sy, icon.bsu, icon.bsv); + DisplayUtil.drawTexturedModalRect(x, y, icon.u, icon.v, sx, sy, icon.su, icon.sv); + } - public static String itemDisplayNameShort(ItemStack itemstack) { - List list = itemDisplayNameMultiline(itemstack); - return list.get(0); - } - - public static void renderIcon(int x, int y, int sx, int sy, IconUI icon){ - Minecraft.getMinecraft().getTextureManager().bindTexture(Gui.icons); - - if (icon == null) - return; - - if (icon.bu != -1) - DisplayUtil.drawTexturedModalRect(x, y, icon.bu, icon.bv, sx, sy, icon.bsu, icon.bsv); - DisplayUtil.drawTexturedModalRect(x, y, icon.u, icon.v, sx, sy, icon.su, icon.sv); - } - } diff --git a/src/main/java/mcp/mobius/waila/overlay/IconUI.java b/src/main/java/mcp/mobius/waila/overlay/IconUI.java index a795a9e..b21691d 100644 --- a/src/main/java/mcp/mobius/waila/overlay/IconUI.java +++ b/src/main/java/mcp/mobius/waila/overlay/IconUI.java @@ -1,49 +1,50 @@ package mcp.mobius.waila.overlay; + import static mcp.mobius.waila.api.SpecialChars.*; import java.util.HashMap; public enum IconUI { -HEART (52, 0, 9, 9, 52, 9, 9, 9, "a"), -HHEART(61, 0, 9, 9, 52, 9, 9, 9, "b"), -EHEART(52, 9, 9, 9, "c"), -BUBBLEEXP(25, 18, 9, 9, "x"); - private final static HashMap lk = new HashMap(); - static { - for (IconUI icon : IconUI.values()){ - lk.put(icon.symbol, icon); - } - } + HEART(52, 0, 9, 9, 52, 9, 9, 9, "a"), + HHEART(61, 0, 9, 9, 52, 9, 9, 9, "b"), + EHEART(52, 9, 9, 9, "c"), + BUBBLEEXP(25, 18, 9, 9, "x"); + + private final static HashMap lk = new HashMap(); + static { + for (IconUI icon : IconUI.values()) { + lk.put(icon.symbol, icon); + } + } public final int u, v, su, sv; public final int bu, bv, bsu, bsv; public final String symbol; - - private IconUI(int u, int v, int su, int sv, String symbol){ - this(u,v,su,sv,-1,-1,-1,-1,symbol); - } - private IconUI(int u, int v, int su, int sv, int bu, int bv, int bsu, int bsv, String symbol){ - this.u = u; - this.v = v; - this.su = su; - this.sv = sv; - this.bu = bu; - this.bv = bv; - this.bsu = bsu; - this.bsv = bsv; - this.symbol = WailaStyle + WailaIcon + symbol; - } - - public static IconUI bySymbol(String s){ - IconUI iconUI = lk.get(s); - if (iconUI == null){ - return lk.get("x"); - } - else { - return lk.get(s); - } - } - + private IconUI(int u, int v, int su, int sv, String symbol) { + this(u, v, su, sv, -1, -1, -1, -1, symbol); + } + + private IconUI(int u, int v, int su, int sv, int bu, int bv, int bsu, int bsv, String symbol) { + this.u = u; + this.v = v; + this.su = su; + this.sv = sv; + this.bu = bu; + this.bv = bv; + this.bsu = bsu; + this.bsv = bsv; + this.symbol = WailaStyle + WailaIcon + symbol; + } + + public static IconUI bySymbol(String s) { + IconUI iconUI = lk.get(s); + if (iconUI == null) { + return lk.get("x"); + } else { + return lk.get(s); + } + } + } diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java index fe878fd..1d1b978 100644 --- a/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java @@ -1,24 +1,32 @@ package mcp.mobius.waila.overlay; -import net.minecraftforge.common.config.Configuration; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.utils.Constants; +import net.minecraftforge.common.config.Configuration; + public class OverlayConfig { - 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 static void updateColors(){ - OverlayConfig.alpha = (int)(ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA,0) / 100.0f * 256) << 24; - OverlayConfig.bgcolor = OverlayConfig.alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR,0); - OverlayConfig.gradient1 = OverlayConfig.alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1,0); - OverlayConfig.gradient2 = OverlayConfig.alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2,0); - OverlayConfig.fontcolor = OverlayConfig.alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR,0); - } + + 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 static void updateColors() { + OverlayConfig.alpha = (int) (ConfigHandler.instance() + .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, 0) / 100.0f + * 256) << 24; + OverlayConfig.bgcolor = OverlayConfig.alpha + + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR, 0); + OverlayConfig.gradient1 = OverlayConfig.alpha + + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1, 0); + OverlayConfig.gradient2 = OverlayConfig.alpha + + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2, 0); + OverlayConfig.fontcolor = OverlayConfig.alpha + + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR, 0); + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java index 7e75502..8df3499 100644 --- a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java @@ -1,128 +1,127 @@ package mcp.mobius.waila.overlay; +import mcp.mobius.waila.api.impl.ConfigHandler; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.util.MovingObjectPosition; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.utils.Constants; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraftforge.common.config.Configuration; -import net.minecraft.util.MovingObjectPosition; - public class OverlayRenderer { - protected static boolean hasBlending; - protected static boolean hasLight; - protected static boolean hasDepthTest; - protected static boolean hasLight0; - protected static boolean hasLight1; - protected static boolean hasRescaleNormal; - protected static boolean hasColorMaterial; - protected static int boundTexIndex; - - public static void renderOverlay() - { + protected static boolean hasBlending; + protected static boolean hasLight; + protected static boolean hasDepthTest; + protected static boolean hasLight0; + protected static boolean hasLight1; + protected static boolean hasRescaleNormal; + protected static boolean hasColorMaterial; + protected static int boundTexIndex; + + public static void renderOverlay() { Minecraft mc = Minecraft.getMinecraft(); - if(!(mc.currentScreen == null && - mc.theWorld != null && - Minecraft.isGuiEnabled() && - !mc.gameSettings.keyBindPlayerList.getIsKeyPressed() && - ConfigHandler.instance().showTooltip() && - RayTracing.instance().getTarget() != null)) - return; - - if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && RayTracing.instance().getTargetStack() != null) - { + if (!(mc.currentScreen == null && mc.theWorld != null + && Minecraft.isGuiEnabled() + && !mc.gameSettings.keyBindPlayerList.getIsKeyPressed() + && ConfigHandler.instance().showTooltip() + && RayTracing.instance().getTarget() != null)) + return; + + if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK + && RayTracing.instance().getTargetStack() != null) { renderOverlay(WailaTickHandler.instance().tooltip); } - if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && ConfigHandler.instance().getConfig("general.showents")) - { - renderOverlay(WailaTickHandler.instance().tooltip); + if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY + && ConfigHandler.instance().getConfig("general.showents")) { + renderOverlay(WailaTickHandler.instance().tooltip); } - } - - public static void renderOverlay(Tooltip tooltip) - { - //TrueTypeFont font = (TrueTypeFont)mod_Waila.proxy.getFont(); - - GL11.glPushMatrix(); - saveGLState(); - - GL11.glScalef(OverlayConfig.scale, OverlayConfig.scale, 1.0f); - + } + + public static void renderOverlay(Tooltip tooltip) { + // TrueTypeFont font = (TrueTypeFont)mod_Waila.proxy.getFont(); + + GL11.glPushMatrix(); + saveGLState(); + + GL11.glScalef(OverlayConfig.scale, OverlayConfig.scale, 1.0f); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); - - drawTooltipBox(tooltip.x, tooltip.y, tooltip.w, tooltip.h, OverlayConfig.bgcolor, OverlayConfig.gradient1, OverlayConfig.gradient2); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA); - tooltip.draw(); + + drawTooltipBox( + tooltip.x, + tooltip.y, + tooltip.w, + tooltip.h, + OverlayConfig.bgcolor, + OverlayConfig.gradient1, + OverlayConfig.gradient2); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + tooltip.draw(); GL11.glDisable(GL11.GL_BLEND); tooltip.draw2nd(); - - if (tooltip.hasIcon) - RenderHelper.enableGUIStandardItemLighting(); - - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - if (tooltip.hasIcon && tooltip.stack != null && tooltip.stack.getItem() != null) - DisplayUtil.renderStack(tooltip.x+5, tooltip.y+tooltip.h/2-8, tooltip.stack); - + if (tooltip.hasIcon) RenderHelper.enableGUIStandardItemLighting(); + + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + if (tooltip.hasIcon && tooltip.stack != null && tooltip.stack.getItem() != null) + DisplayUtil.renderStack(tooltip.x + 5, tooltip.y + tooltip.h / 2 - 8, tooltip.stack); + loadGLState(); - GL11.glPopMatrix(); - - - } - - public static void saveGLState(){ - hasBlending = GL11.glGetBoolean(GL11.GL_BLEND); - hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING); - //hasLight0 = GL11.glGetBoolean(GL11.GL_LIGHT0); - //hasLight1 = GL11.glGetBoolean(GL11.GL_LIGHT1); - hasDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST); - //hasRescaleNormal = GL11.glGetBoolean(GL12.GL_RESCALE_NORMAL); - //hasColorMaterial = GL11.glGetBoolean(GL11.GL_COLOR_MATERIAL); - boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); - GL11.glPushAttrib(GL11.GL_CURRENT_BIT); + GL11.glPopMatrix(); + + } + + public static void saveGLState() { + hasBlending = GL11.glGetBoolean(GL11.GL_BLEND); + hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING); + // hasLight0 = GL11.glGetBoolean(GL11.GL_LIGHT0); + // hasLight1 = GL11.glGetBoolean(GL11.GL_LIGHT1); + hasDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST); + // hasRescaleNormal = GL11.glGetBoolean(GL12.GL_RESCALE_NORMAL); + // hasColorMaterial = GL11.glGetBoolean(GL11.GL_COLOR_MATERIAL); + boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); + GL11.glPushAttrib(GL11.GL_CURRENT_BIT); + } + + public static void loadGLState() { + if (hasBlending) GL11.glEnable(GL11.GL_BLEND); + else GL11.glDisable(GL11.GL_BLEND); + // if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); else GL11.glDisable(GL11.GL_LIGHTING); + // if (hasLight0) GL11.glEnable(GL11.GL_LIGHT0); else GL11.glDisable(GL11.GL_LIGHT0); + if (hasLight1) GL11.glEnable(GL11.GL_LIGHT1); + else GL11.glDisable(GL11.GL_LIGHT1); + if (hasDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST); + else GL11.glDisable(GL11.GL_DEPTH_TEST); + // if (hasRescaleNormal) GL11.glEnable(GL12.GL_RESCALE_NORMAL); else GL11.glDisable(GL12.GL_RESCALE_NORMAL); + // if (hasColorMaterial) GL11.glEnable(GL11.GL_COLOR_MATERIAL); else GL11.glDisable(GL11.GL_COLOR_MATERIAL); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex); + GL11.glPopAttrib(); + // GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + } + + public static void drawTooltipBox(int x, int y, int w, int h, int bg, int grad1, int grad2) { + // int bg = 0xf0100010; + DisplayUtil.drawGradientRect(x + 1, y, w - 1, 1, bg, bg); + DisplayUtil.drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg); + DisplayUtil.drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg);// center + DisplayUtil.drawGradientRect(x, y + 1, 1, h - 1, bg, bg); + DisplayUtil.drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg); + // int grad1 = 0x505000ff; + // int grad2 = 0x5028007F; + DisplayUtil.drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2); + DisplayUtil.drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2); + + DisplayUtil.drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1); + DisplayUtil.drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2); } - - public static void loadGLState(){ - if (hasBlending) GL11.glEnable(GL11.GL_BLEND); else GL11.glDisable(GL11.GL_BLEND); - //if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); else GL11.glDisable(GL11.GL_LIGHTING); - //if (hasLight0) GL11.glEnable(GL11.GL_LIGHT0); else GL11.glDisable(GL11.GL_LIGHT0); - if (hasLight1) GL11.glEnable(GL11.GL_LIGHT1); else GL11.glDisable(GL11.GL_LIGHT1); - if (hasDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST); else GL11.glDisable(GL11.GL_DEPTH_TEST); - //if (hasRescaleNormal) GL11.glEnable(GL12.GL_RESCALE_NORMAL); else GL11.glDisable(GL12.GL_RESCALE_NORMAL); - //if (hasColorMaterial) GL11.glEnable(GL11.GL_COLOR_MATERIAL); else GL11.glDisable(GL11.GL_COLOR_MATERIAL); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex); - GL11.glPopAttrib(); - //GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - } - - public static void drawTooltipBox(int x, int y, int w, int h, int bg, int grad1, int grad2) - { - //int bg = 0xf0100010; - DisplayUtil.drawGradientRect(x + 1, y, w - 1, 1, bg, bg); - DisplayUtil.drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg); - DisplayUtil.drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg);//center - DisplayUtil.drawGradientRect(x, y + 1, 1, h - 1, bg, bg); - DisplayUtil.drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg); - //int grad1 = 0x505000ff; - //int grad2 = 0x5028007F; - DisplayUtil.drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2); - DisplayUtil.drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2); - - DisplayUtil.drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1); - DisplayUtil.drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2); - } } diff --git a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java index 5a5efd4..be58786 100644 --- a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java +++ b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java @@ -11,14 +11,13 @@ import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.utils.Constants; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; @@ -29,215 +28,193 @@ import net.minecraftforge.common.config.Configuration; public class RayTracing { - private static RayTracing _instance; - private RayTracing(){} - public static RayTracing instance(){ - if(_instance == null) - _instance = new RayTracing(); - return _instance; - } - - private MovingObjectPosition target = null; - private ItemStack targetStack = null; - private Entity targetEntity= null; - private Minecraft mc = Minecraft.getMinecraft(); - - public void fire(){ - if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY){ - this.target = mc.objectMouseOver; - this.targetStack = null; - return; - } - - EntityLivingBase viewpoint = mc.renderViewEntity; - if (viewpoint == null) return; - - this.target = this.rayTrace(viewpoint, mc.playerController.getBlockReachDistance(), 0); - - if (this.target == null) return; - } - - public MovingObjectPosition getTarget(){ - return this.target; - } - - public ItemStack getTargetStack(){ - if (this.target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - this.targetStack = this.getIdentifierStack(); - else - this.targetStack = null; - - return this.targetStack; - } - - public Entity getTargetEntity(){ - if (this.target.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) - this.targetEntity = this.getIdentifierEntity(); - else - this.targetEntity = null; - - return this.targetEntity; - } - - public MovingObjectPosition rayTrace(EntityLivingBase entity, double par1, float par3) - { - Vec3 vec3 = entity.getPosition(par3); + private static RayTracing _instance; + + private RayTracing() {} + + public static RayTracing instance() { + if (_instance == null) _instance = new RayTracing(); + return _instance; + } + + private MovingObjectPosition target = null; + private ItemStack targetStack = null; + private Entity targetEntity = null; + private Minecraft mc = Minecraft.getMinecraft(); + + public void fire() { + if (mc.objectMouseOver != null + && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) { + this.target = mc.objectMouseOver; + this.targetStack = null; + return; + } + + EntityLivingBase viewpoint = mc.renderViewEntity; + if (viewpoint == null) return; + + this.target = this.rayTrace(viewpoint, mc.playerController.getBlockReachDistance(), 0); + + if (this.target == null) return; + } + + public MovingObjectPosition getTarget() { + return this.target; + } + + public ItemStack getTargetStack() { + if (this.target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + this.targetStack = this.getIdentifierStack(); + else this.targetStack = null; + + return this.targetStack; + } + + public Entity getTargetEntity() { + if (this.target.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) + this.targetEntity = this.getIdentifierEntity(); + else this.targetEntity = null; + + return this.targetEntity; + } + + public MovingObjectPosition rayTrace(EntityLivingBase entity, double par1, float par3) { + Vec3 vec3 = entity.getPosition(par3); Vec3 vec31 = entity.getLook(par3); Vec3 vec32 = vec3.addVector(vec31.xCoord * par1, vec31.yCoord * par1, vec31.zCoord * par1); - - //if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true)) + + // if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true)) if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true)) - return entity.worldObj.rayTraceBlocks(vec3, vec32, true); - else - return entity.worldObj.rayTraceBlocks(vec3, vec32, false); - } - - public ItemStack getIdentifierStack(){ + return entity.worldObj.rayTraceBlocks(vec3, vec32, true); + else return entity.worldObj.rayTraceBlocks(vec3, vec32, false); + } + + public ItemStack getIdentifierStack() { World world = mc.theWorld; ArrayList items = this.getIdentifierItems(); - - if (items.isEmpty()) - return null; - - Collections.sort(items, new Comparator() - { + + if (items.isEmpty()) return null; + + Collections.sort(items, new Comparator() { + @Override - public int compare(ItemStack stack0, ItemStack stack1) - { + public int compare(ItemStack stack0, ItemStack stack1) { return stack1.getItemDamage() - stack0.getItemDamage(); } }); - return items.get(0); - } - - public Entity getIdentifierEntity(){ - ArrayList ents = new ArrayList(); - - if (this.target == null) - return null; - - if (ModuleRegistrar.instance().hasOverrideEntityProviders(this.target.entityHit)){ - for (List listProviders : ModuleRegistrar.instance().getOverrideEntityProviders(this.target.entityHit).values()){ - for (IWailaEntityProvider provider : listProviders){ - ents.add(provider.getWailaOverride(DataAccessorCommon.instance, ConfigHandler.instance())); - } - } + return items.get(0); + } + + public Entity getIdentifierEntity() { + ArrayList ents = new ArrayList(); + + if (this.target == null) return null; + + if (ModuleRegistrar.instance().hasOverrideEntityProviders(this.target.entityHit)) { + for (List listProviders : ModuleRegistrar.instance() + .getOverrideEntityProviders(this.target.entityHit).values()) { + for (IWailaEntityProvider provider : listProviders) { + ents.add(provider.getWailaOverride(DataAccessorCommon.instance, ConfigHandler.instance())); + } + } } - - if(ents.size() > 0) - return ents.get(0); - else - return this.target.entityHit; - } - - public ArrayList getIdentifierItems() - { + + if (ents.size() > 0) return ents.get(0); + else return this.target.entityHit; + } + + public ArrayList getIdentifierItems() { ArrayList items = new ArrayList(); - - if (this.target == null) - return items; - - EntityPlayer player = mc.thePlayer; - World world = mc.theWorld; - + + if (this.target == null) return items; + + EntityPlayer player = mc.thePlayer; + World world = mc.theWorld; + int x = this.target.blockX; int y = this.target.blockY; int z = this.target.blockZ; - //int blockID = world.getBlockId(x, y, z); - //Block mouseoverBlock = Block.blocksList[blockID]; - Block mouseoverBlock = world.getBlock(x, y, z); - TileEntity tileEntity = world.getTileEntity(x, y, z); + // int blockID = world.getBlockId(x, y, z); + // Block mouseoverBlock = Block.blocksList[blockID]; + Block mouseoverBlock = world.getBlock(x, y, z); + TileEntity tileEntity = world.getTileEntity(x, y, z); if (mouseoverBlock == null) return items; - - if (ModuleRegistrar.instance().hasStackProviders(mouseoverBlock)){ - for (List providersList : ModuleRegistrar.instance().getStackProviders(mouseoverBlock).values()){ - for(IWailaDataProvider provider : providersList){ - ItemStack providerStack = provider.getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); - if (providerStack != null){ - - if (providerStack.getItem() == null) - return new ArrayList(); - - items.add(providerStack); - } - } - } - } - - if (tileEntity != null && ModuleRegistrar.instance().hasStackProviders(tileEntity)){ - for (List providersList : ModuleRegistrar.instance().getStackProviders(tileEntity).values()){ - - for(IWailaDataProvider provider : providersList){ - ItemStack providerStack = provider.getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); - if (providerStack != null){ - - if (providerStack.getItem() == null) - return new ArrayList(); - - items.add(providerStack); - } - } - } - } - - if(items.size() > 0) - return items; - if (world.getTileEntity(x, y, z) == null){ - try{ - ItemStack block = new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z)); + if (ModuleRegistrar.instance().hasStackProviders(mouseoverBlock)) { + for (List providersList : ModuleRegistrar.instance().getStackProviders(mouseoverBlock) + .values()) { + for (IWailaDataProvider provider : providersList) { + ItemStack providerStack = provider + .getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); + if (providerStack != null) { - //System.out.printf("%s %s %s\n", block, block.getDisplayName(), block.getItemDamage()); - - if (block.getItem() != null) - items.add(block); - //else - // items.add(new ItemStack(new ItemBlock(mouseoverBlock))); - //else - // items.add(new ItemStack(Item.getItemFromBlock(mouseoverBlock))); - - - } catch(Exception e){ - } + if (providerStack.getItem() == null) return new ArrayList(); + + items.add(providerStack); + } + } + } } - if(items.size() > 0) - return items; + if (tileEntity != null && ModuleRegistrar.instance().hasStackProviders(tileEntity)) { + for (List providersList : ModuleRegistrar.instance().getStackProviders(tileEntity) + .values()) { - try{ - ItemStack pick = mouseoverBlock.getPickBlock(this.target, world, x, y, z); - if(pick != null) - items.add(pick); - }catch(Exception e){} - - if(items.size() > 0) - return items; + for (IWailaDataProvider provider : providersList) { + ItemStack providerStack = provider + .getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); + if (providerStack != null) { + + if (providerStack.getItem() == null) return new ArrayList(); + + items.add(providerStack); + } + } + } + } + + if (items.size() > 0) return items; + + if (world.getTileEntity(x, y, z) == null) { + try { + ItemStack block = new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z)); + + // System.out.printf("%s %s %s\n", block, block.getDisplayName(), block.getItemDamage()); + + if (block.getItem() != null) items.add(block); + // else + // items.add(new ItemStack(new ItemBlock(mouseoverBlock))); + // else + // items.add(new ItemStack(Item.getItemFromBlock(mouseoverBlock))); + + } catch (Exception e) {} + } + + if (items.size() > 0) return items; + + try { + ItemStack pick = mouseoverBlock.getPickBlock(this.target, world, x, y, z); + if (pick != null) items.add(pick); + } catch (Exception e) {} + + if (items.size() > 0) return items; /* - try - { - items.addAll(mouseoverBlock.getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0)); - } - catch(Exception e){} - - if(items.size() > 0) - return items; - */ - - if(mouseoverBlock instanceof IShearable) - { - IShearable shearable = (IShearable)mouseoverBlock; - if(shearable.isShearable(new ItemStack(Items.shears), world, x, y, z)) - { + * try { items.addAll(mouseoverBlock.getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0)); } + * catch(Exception e){} if(items.size() > 0) return items; + */ + + if (mouseoverBlock instanceof IShearable) { + IShearable shearable = (IShearable) mouseoverBlock; + if (shearable.isShearable(new ItemStack(Items.shears), world, x, y, z)) { items.addAll(shearable.onSheared(new ItemStack(Items.shears), world, x, y, z, 0)); } } - - if(items.size() == 0) - items.add(0, new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z))); - + + if (items.size() == 0) items.add(0, new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z))); + return items; } - + } diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java index f9a3bca..87851b7 100644 --- a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java +++ b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java @@ -1,228 +1,233 @@ package mcp.mobius.waila.overlay; +import static mcp.mobius.waila.api.SpecialChars.*; + +import java.awt.Dimension; +import java.awt.Point; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.awt.Dimension; -import java.awt.Point; -import org.lwjgl.opengl.GL11; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.config.Configuration; import mcp.mobius.waila.api.IWailaCommonAccessor; -import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderIcon; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderString; -import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderTrueTyper; import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.WailaExceptionHandler; -import static mcp.mobius.waila.api.SpecialChars.*; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.config.Configuration; + +import org.lwjgl.opengl.GL11; public class Tooltip { - public static int TabSpacing = 8; - public static int IconSize = 8; - - ArrayList> lines = new ArrayList>(); - ArrayList> sizes = new ArrayList>(); - ArrayList columnsWidth = new ArrayList(); - ArrayList columnsPos = new ArrayList(); - - ArrayList elements = new ArrayList(); - ArrayList elements2nd = new ArrayList(); - - int w,h,x,y,ty; - int offsetX; - int maxStringW; - Point pos; - boolean hasIcon = false; - ItemStack stack; - - IWailaCommonAccessor accessor = DataAccessorCommon.instance; - - /////////////////////////////////////Renderable/////////////////////////////////////// - private class Renderable{ - final IWailaTooltipRenderer renderer; - final Point pos; - final String[] params; - - public Renderable(IWailaTooltipRenderer renderer, Point pos, String[] params){ - this.renderer = renderer; - this.pos = pos; - this.params = params; - } - public Renderable(IWailaTooltipRenderer renderer, Point pos){ - this(renderer, pos, new String[]{}); - } - - public Point getPos(){ - return this.pos; - } - - public Dimension getSize(IWailaCommonAccessor accessor) { - Dimension dim = new Dimension(0,0); - try { - dim = this.renderer.getSize(this.params, accessor); - } catch (Throwable e){ - WailaExceptionHandler.handleErr(e, this.renderer.getClass().getName() + ".getSize()", null); - } - return dim; - } - - public void draw(IWailaCommonAccessor accessor, int x, int y) { - GL11.glPushMatrix(); - GL11.glTranslatef(x + this.pos.x, y + this.pos.y, 0); - try{ - this.renderer.draw(this.params, accessor); - } catch (Throwable e){ - WailaExceptionHandler.handleErr(e, this.renderer.getClass().getName() + ".draw()", null); - } - GL11.glPopMatrix(); - } - - @Override - public String toString(){ - return String.format("Renderable@[%d,%d] | %s", pos.x, pos.y, renderer); - } - } - //////////////////////////////////////////////////////////////////////////// - - - public Tooltip(List textData, ItemStack stack){ - this(textData, true); - this.stack = stack; - } - - public Tooltip(List textData, boolean hasIcon){ + public static int TabSpacing = 8; + public static int IconSize = 8; - columnsWidth.add(0); // Small init of the arrays to have at least one element - columnsPos.add(0); - - for (String s : textData){ - - ArrayList line = new ArrayList(Arrays.asList(patternTab.split(s))); - ArrayList size = new ArrayList(); - for (String ss : line) - size.add(DisplayUtil.getDisplayWidth(ss)); - - // This line.size() > 1 is to prevent columns to align on lines without column (ie : the name & modid) - if (line.size() > 1){ - while (columnsWidth.size() < line.size()){ - columnsWidth.add(0); - columnsPos.add(0); - } + ArrayList> lines = new ArrayList>(); + ArrayList> sizes = new ArrayList>(); + ArrayList columnsWidth = new ArrayList(); + ArrayList columnsPos = new ArrayList(); - for (int i = 0; i < line.size(); i++) - columnsWidth.set(i, Math.max(columnsWidth.get(i), size.get(i))); - } - - maxStringW = Math.max(maxStringW, DisplayUtil.getDisplayWidth(s) + TabSpacing * (line.size() - 1)); - - lines.add(line); - sizes.add(size); - } - - // We correct if we only have one column - if (columnsWidth.size() == 1) - columnsWidth.set(0, maxStringW); - - // We compute the position of the columns to be able to align the renderable later on - for (int i = 1; i < columnsWidth.size(); i++) - columnsPos.set(i, columnsWidth.get(i - 1) + columnsPos.get(i - 1) + TabSpacing); - - this.computeRenderables(); - this.computePositionAndSize(hasIcon); - } - - private void computeRenderables(){ - int offsetY = 0; - for (int i = 0; i < lines.size(); i++){ // We check all the lines, one by one - int maxHeight = 0; // Maximum height of this line - for (int c = 0; c < lines.get(i).size(); c++){ // We check all the columns for this line - offsetX = columnsPos.get(c); // We move the "cursor" to the current column - String currentLine = lines.get(i).get(c); - Matcher lineMatcher = patternLineSplit.matcher(currentLine); - - while (lineMatcher.find()){ - String cs = lineMatcher.group(); - Renderable renderable = null; - Matcher renderMatcher = patternRender.matcher(cs); //We keep a matcher here to be able to check if we have a Renderer. Might be better to do a startWith + full matcher init after the check - Matcher iconMatcher = patternIcon.matcher(cs); - - if (renderMatcher.find()){ - String renderName = renderMatcher.group("name"); - - IWailaTooltipRenderer renderer = ModuleRegistrar.instance().getTooltipRenderer(renderName); - if (renderer != null){ - renderable = new Renderable(renderer, new Point(offsetX, offsetY), renderMatcher.group("args").split(",")); - this.elements2nd.add(renderable); - } - } else if (iconMatcher.find()){ - renderable = new Renderable(new TTRenderIcon(iconMatcher.group("type")), new Point(offsetX, offsetY)); - this.elements2nd.add(renderable); - } else { - if (cs.startsWith(ALIGNRIGHT)) - offsetX += columnsWidth.get(c) - DisplayUtil.getDisplayWidth(currentLine.substring(lineMatcher.start())); + ArrayList elements = new ArrayList(); + ArrayList elements2nd = new ArrayList(); - if (cs.startsWith(ALIGNCENTER)) - offsetX += (columnsWidth.get(c) - DisplayUtil.getDisplayWidth(currentLine.substring(lineMatcher.start()))) / 2; - - renderable = new Renderable(new TTRenderString(DisplayUtil.stripWailaSymbols(cs)), new Point(offsetX, offsetY)); - //renderable = new Renderable(new TTRenderTrueTyper(DisplayUtil.stripWailaSymbols(cs)), new Point(offsetX, offsetY)); - this.elements.add(renderable); - } - - if (renderable != null){ - offsetX += renderable.getSize(accessor).width; - maxHeight = Math.max(maxHeight, renderable.getSize(accessor).height + 2); - } - } - } - offsetY += maxHeight; - } - } - - private int getRenderableTotalHeight(){ - int result = 0; - for (Renderable r : this.elements) - result = Math.max(r.getPos().y + r.getSize(accessor).height + 2, result); - return result; - } - - private void computePositionAndSize(boolean hasIcon){ - this.pos = new Point(ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX,0), - ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY,0)); - this.hasIcon = hasIcon; - - int paddingW = hasIcon ? 29 : 13; - int paddingH = hasIcon ? 24 : 0; - offsetX = hasIcon ? 24 : 6; - - w = maxStringW + paddingW; - - h = Math.max(paddingH, this.getRenderableTotalHeight() + 8); - - Dimension size = DisplayUtil.displaySize(); - x = ((int)(size.width / OverlayConfig.scale)-w-1)*pos.x/10000; - y = ((int)(size.height / OverlayConfig.scale)-h-1)*pos.y/10000; - - ty = (h - this.getRenderableTotalHeight())/2 + 1; - } - - public void draw(){ - for (Renderable r : this.elements) - r.draw(accessor, x + offsetX, y + ty); - } + int w, h, x, y, ty; + int offsetX; + int maxStringW; + Point pos; + boolean hasIcon = false; + ItemStack stack; - public void draw2nd(){ - for (Renderable r : this.elements2nd) - r.draw(accessor, x + offsetX, y + ty); - } + IWailaCommonAccessor accessor = DataAccessorCommon.instance; + + ///////////////////////////////////// Renderable/////////////////////////////////////// + private class Renderable { + + final IWailaTooltipRenderer renderer; + final Point pos; + final String[] params; + + public Renderable(IWailaTooltipRenderer renderer, Point pos, String[] params) { + this.renderer = renderer; + this.pos = pos; + this.params = params; + } + + public Renderable(IWailaTooltipRenderer renderer, Point pos) { + this(renderer, pos, new String[] {}); + } + + public Point getPos() { + return this.pos; + } + + public Dimension getSize(IWailaCommonAccessor accessor) { + Dimension dim = new Dimension(0, 0); + try { + dim = this.renderer.getSize(this.params, accessor); + } catch (Throwable e) { + WailaExceptionHandler.handleErr(e, this.renderer.getClass().getName() + ".getSize()", null); + } + return dim; + } + + public void draw(IWailaCommonAccessor accessor, int x, int y) { + GL11.glPushMatrix(); + GL11.glTranslatef(x + this.pos.x, y + this.pos.y, 0); + try { + this.renderer.draw(this.params, accessor); + } catch (Throwable e) { + WailaExceptionHandler.handleErr(e, this.renderer.getClass().getName() + ".draw()", null); + } + GL11.glPopMatrix(); + } + + @Override + public String toString() { + return String.format("Renderable@[%d,%d] | %s", pos.x, pos.y, renderer); + } + } + //////////////////////////////////////////////////////////////////////////// + + public Tooltip(List textData, ItemStack stack) { + this(textData, true); + this.stack = stack; + } + + public Tooltip(List textData, boolean hasIcon) { + + columnsWidth.add(0); // Small init of the arrays to have at least one element + columnsPos.add(0); + + for (String s : textData) { + + ArrayList line = new ArrayList(Arrays.asList(patternTab.split(s))); + ArrayList size = new ArrayList(); + for (String ss : line) size.add(DisplayUtil.getDisplayWidth(ss)); + + // This line.size() > 1 is to prevent columns to align on lines without column (ie : the name & modid) + if (line.size() > 1) { + while (columnsWidth.size() < line.size()) { + columnsWidth.add(0); + columnsPos.add(0); + } + + for (int i = 0; i < line.size(); i++) columnsWidth.set(i, Math.max(columnsWidth.get(i), size.get(i))); + } + + maxStringW = Math.max(maxStringW, DisplayUtil.getDisplayWidth(s) + TabSpacing * (line.size() - 1)); + + lines.add(line); + sizes.add(size); + } + + // We correct if we only have one column + if (columnsWidth.size() == 1) columnsWidth.set(0, maxStringW); + + // We compute the position of the columns to be able to align the renderable later on + for (int i = 1; i < columnsWidth.size(); i++) + columnsPos.set(i, columnsWidth.get(i - 1) + columnsPos.get(i - 1) + TabSpacing); + + this.computeRenderables(); + this.computePositionAndSize(hasIcon); + } + + private void computeRenderables() { + int offsetY = 0; + for (int i = 0; i < lines.size(); i++) { // We check all the lines, one by one + int maxHeight = 0; // Maximum height of this line + for (int c = 0; c < lines.get(i).size(); c++) { // We check all the columns for this line + offsetX = columnsPos.get(c); // We move the "cursor" to the current column + String currentLine = lines.get(i).get(c); + Matcher lineMatcher = patternLineSplit.matcher(currentLine); + + while (lineMatcher.find()) { + String cs = lineMatcher.group(); + Renderable renderable = null; + Matcher renderMatcher = patternRender.matcher(cs); // We keep a matcher here to be able to check if + // we have a Renderer. Might be better to do a + // startWith + full matcher init after the check + Matcher iconMatcher = patternIcon.matcher(cs); + + if (renderMatcher.find()) { + String renderName = renderMatcher.group("name"); + + IWailaTooltipRenderer renderer = ModuleRegistrar.instance().getTooltipRenderer(renderName); + if (renderer != null) { + renderable = new Renderable( + renderer, + new Point(offsetX, offsetY), + renderMatcher.group("args").split(",")); + this.elements2nd.add(renderable); + } + } else if (iconMatcher.find()) { + renderable = new Renderable( + new TTRenderIcon(iconMatcher.group("type")), + new Point(offsetX, offsetY)); + this.elements2nd.add(renderable); + } else { + if (cs.startsWith(ALIGNRIGHT)) offsetX += columnsWidth.get(c) + - DisplayUtil.getDisplayWidth(currentLine.substring(lineMatcher.start())); + + if (cs.startsWith(ALIGNCENTER)) offsetX += (columnsWidth.get(c) + - DisplayUtil.getDisplayWidth(currentLine.substring(lineMatcher.start()))) / 2; + + renderable = new Renderable( + new TTRenderString(DisplayUtil.stripWailaSymbols(cs)), + new Point(offsetX, offsetY)); + // renderable = new Renderable(new TTRenderTrueTyper(DisplayUtil.stripWailaSymbols(cs)), new + // Point(offsetX, offsetY)); + this.elements.add(renderable); + } + + if (renderable != null) { + offsetX += renderable.getSize(accessor).width; + maxHeight = Math.max(maxHeight, renderable.getSize(accessor).height + 2); + } + } + } + offsetY += maxHeight; + } + } + + private int getRenderableTotalHeight() { + int result = 0; + for (Renderable r : this.elements) result = Math.max(r.getPos().y + r.getSize(accessor).height + 2, result); + return result; + } + + private void computePositionAndSize(boolean hasIcon) { + this.pos = new Point( + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 0), + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 0)); + this.hasIcon = hasIcon; + + int paddingW = hasIcon ? 29 : 13; + int paddingH = hasIcon ? 24 : 0; + offsetX = hasIcon ? 24 : 6; + + w = maxStringW + paddingW; + + h = Math.max(paddingH, this.getRenderableTotalHeight() + 8); + + Dimension size = DisplayUtil.displaySize(); + x = ((int) (size.width / OverlayConfig.scale) - w - 1) * pos.x / 10000; + y = ((int) (size.height / OverlayConfig.scale) - h - 1) * pos.y / 10000; + + ty = (h - this.getRenderableTotalHeight()) / 2 + 1; + } + + public void draw() { + for (Renderable r : this.elements) r.draw(accessor, x + offsetX, y + ty); + } + + public void draw2nd() { + for (Renderable r : this.elements2nd) r.draw(accessor, x + offsetX, y + ty); + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java index e3cadb2..ef6cca8 100644 --- a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java +++ b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java @@ -1,10 +1,9 @@ package mcp.mobius.waila.overlay; +import static mcp.mobius.waila.api.SpecialChars.*; + import java.util.List; -import org.lwjgl.input.Keyboard; - -import mcp.mobius.waila.api.ITaggedList; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.MetaDataProvider; @@ -12,6 +11,7 @@ import mcp.mobius.waila.api.impl.TipList; import mcp.mobius.waila.cbcore.Layout; import mcp.mobius.waila.client.KeyEvent; import mcp.mobius.waila.utils.Constants; + import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -20,116 +20,166 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.config.Configuration; + +import org.lwjgl.input.Keyboard; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import static mcp.mobius.waila.api.SpecialChars.*; -public class WailaTickHandler{ +public class WailaTickHandler { - //public static LangUtil lang = LangUtil.loadLangDir("waila"); - - private int ticks = 0; - public ItemStack identifiedHighlight = new ItemStack(Blocks.dirt); - private List currenttip = new TipList(); - private List currenttipHead = new TipList(); - private List currenttipBody = new TipList(); - private List currenttipTail = new TipList(); - public Tooltip tooltip = null; - public MetaDataProvider handler = new MetaDataProvider(); - private Minecraft mc = Minecraft.getMinecraft(); - - private static WailaTickHandler _instance; - private WailaTickHandler(){} - - public static WailaTickHandler instance(){ - if(_instance == null) - _instance = new WailaTickHandler(); - return _instance; - } + // public static LangUtil lang = LangUtil.loadLangDir("waila"); - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void tickRender(TickEvent.RenderTickEvent event) { - OverlayRenderer.renderOverlay(); - } + private int ticks = 0; + public ItemStack identifiedHighlight = new ItemStack(Blocks.dirt); + private List currenttip = new TipList(); + private List currenttipHead = new TipList(); + private List currenttipBody = new TipList(); + private List currenttipTail = new TipList(); + public Tooltip tooltip = null; + public MetaDataProvider handler = new MetaDataProvider(); + private Minecraft mc = Minecraft.getMinecraft(); - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void tickClient(TickEvent.ClientTickEvent event) { - - if (!Keyboard.isKeyDown(KeyEvent.key_show.getKeyCode()) && - !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false) && - ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false)){ - ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false); - } - - - World world = mc.theWorld; - EntityPlayer player = mc.thePlayer; - if (world != null && player != null){ - RayTracing.instance().fire(); - MovingObjectPosition target = RayTracing.instance().getTarget(); - - if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK){ - DataAccessorCommon accessor = DataAccessorCommon.instance; - accessor.set(world, player, target); - ItemStack targetStack = RayTracing.instance().getTargetStack(); // Here we get either the proper stack or the override - - if (targetStack != null){ - this.currenttip = new TipList(); - this.currenttipHead = new TipList(); - this.currenttipBody = new TipList(); - this.currenttipTail = new TipList(); - - - //this.identifiedHighlight = handler.identifyHighlight(world, player, target); - this.currenttipHead = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttipHead, Layout.HEADER); - this.currenttipBody = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttipBody, Layout.BODY); - this.currenttipTail = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttipTail, Layout.FOOTER); - - if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, false) && currenttipBody.size() > 0 && !accessor.getPlayer().isSneaking()){ - currenttipBody.clear(); - currenttipBody.add(ITALIC + "Press shift for more data"); - } - - this.currenttip.addAll(this.currenttipHead); - this.currenttip.addAll(this.currenttipBody); - this.currenttip.addAll(this.currenttipTail); - - this.tooltip = new Tooltip(this.currenttip, targetStack); - } - } - else if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY){ - DataAccessorCommon accessor = DataAccessorCommon.instance; - accessor.set(world, player, target); - - Entity targetEnt = RayTracing.instance().getTargetEntity(); // This need to be replaced by the override check. - - if (targetEnt != null){ - this.currenttip = new TipList(); - this.currenttipHead = new TipList(); - this.currenttipBody = new TipList(); - this.currenttipTail = new TipList(); - - this.currenttipHead = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipHead, Layout.HEADER); - this.currenttipBody = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipBody, Layout.BODY); - this.currenttipTail = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipTail, Layout.FOOTER); - - if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTENTS, false) && currenttipBody.size() > 0 && !accessor.getPlayer().isSneaking()){ - currenttipBody.clear(); - currenttipBody.add(ITALIC + "Press shift for more data"); - } - - this.currenttip.addAll(this.currenttipHead); - this.currenttip.addAll(this.currenttipBody); - this.currenttip.addAll(this.currenttipTail); - - this.tooltip = new Tooltip(this.currenttip, false); - } - } - } + private static WailaTickHandler _instance; - } + private WailaTickHandler() {} + + public static WailaTickHandler instance() { + if (_instance == null) _instance = new WailaTickHandler(); + return _instance; + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void tickRender(TickEvent.RenderTickEvent event) { + OverlayRenderer.renderOverlay(); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void tickClient(TickEvent.ClientTickEvent event) { + + if (!Keyboard.isKeyDown(KeyEvent.key_show.getKeyCode()) + && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false) + && ConfigHandler.instance() + .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false)) { + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false); + } + + World world = mc.theWorld; + EntityPlayer player = mc.thePlayer; + if (world != null && player != null) { + RayTracing.instance().fire(); + MovingObjectPosition target = RayTracing.instance().getTarget(); + + if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + DataAccessorCommon accessor = DataAccessorCommon.instance; + accessor.set(world, player, target); + ItemStack targetStack = RayTracing.instance().getTargetStack(); // Here we get either the proper stack + // or the override + + if (targetStack != null) { + this.currenttip = new TipList(); + this.currenttipHead = new TipList(); + this.currenttipBody = new TipList(); + this.currenttipTail = new TipList(); + + // this.identifiedHighlight = handler.identifyHighlight(world, player, target); + this.currenttipHead = handler.handleBlockTextData( + targetStack, + world, + player, + target, + accessor, + currenttipHead, + Layout.HEADER); + this.currenttipBody = handler.handleBlockTextData( + targetStack, + world, + player, + target, + accessor, + currenttipBody, + Layout.BODY); + this.currenttipTail = handler.handleBlockTextData( + targetStack, + world, + player, + target, + accessor, + currenttipTail, + Layout.FOOTER); + + if (ConfigHandler.instance() + .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, false) + && currenttipBody.size() > 0 + && !accessor.getPlayer().isSneaking()) { + currenttipBody.clear(); + currenttipBody.add(ITALIC + "Press shift for more data"); + } + + this.currenttip.addAll(this.currenttipHead); + this.currenttip.addAll(this.currenttipBody); + this.currenttip.addAll(this.currenttipTail); + + this.tooltip = new Tooltip(this.currenttip, targetStack); + } + } else if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) { + DataAccessorCommon accessor = DataAccessorCommon.instance; + accessor.set(world, player, target); + + Entity targetEnt = RayTracing.instance().getTargetEntity(); // This need to be replaced by the override + // check. + + if (targetEnt != null) { + this.currenttip = new TipList(); + this.currenttipHead = new TipList(); + this.currenttipBody = new TipList(); + this.currenttipTail = new TipList(); + + this.currenttipHead = handler.handleEntityTextData( + targetEnt, + world, + player, + target, + accessor, + currenttipHead, + Layout.HEADER); + this.currenttipBody = handler.handleEntityTextData( + targetEnt, + world, + player, + target, + accessor, + currenttipBody, + Layout.BODY); + this.currenttipTail = handler.handleEntityTextData( + targetEnt, + world, + player, + target, + accessor, + currenttipTail, + Layout.FOOTER); + + if (ConfigHandler.instance() + .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTENTS, false) + && currenttipBody.size() > 0 + && !accessor.getPlayer().isSneaking()) { + currenttipBody.clear(); + currenttipBody.add(ITALIC + "Press shift for more data"); + } + + this.currenttip.addAll(this.currenttipHead); + this.currenttip.addAll(this.currenttipBody); + this.currenttip.addAll(this.currenttipTail); + + this.tooltip = new Tooltip(this.currenttip, false); + } + } + } + + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java index f4b684f..5b770d7 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java @@ -1,71 +1,66 @@ package mcp.mobius.waila.overlay.tooltiprenderers; -import static mcp.mobius.waila.api.SpecialChars.WailaIcon; -import static mcp.mobius.waila.api.SpecialChars.WailaStyle; - import java.awt.Dimension; -import net.minecraft.util.MathHelper; import mcp.mobius.waila.api.IWailaCommonAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.overlay.DisplayUtil; import mcp.mobius.waila.overlay.IconUI; -import mcp.mobius.waila.overlay.OverlayRenderer; + +import net.minecraft.util.MathHelper; /** - * Custom renderer for health bars. - * Syntax : {waila.health, nheartperline, health, maxhealth} + * Custom renderer for health bars. Syntax : {waila.health, nheartperline, health, maxhealth} * */ public class TTRenderHealth implements IWailaTooltipRenderer { - @Override - public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { - float maxhearts = Float.valueOf(params[0]); - float health = Float.valueOf(params[1]); - float maxhealth = Float.valueOf(params[2]); - - int heartsPerLine = (int)(Math.min(maxhearts, Math.ceil(maxhealth))); - int nlines = (int)(Math.ceil(maxhealth/maxhearts)); - - return new Dimension(8 * heartsPerLine, 10 * nlines - 2); - } + @Override + public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { + float maxhearts = Float.valueOf(params[0]); + float health = Float.valueOf(params[1]); + float maxhealth = Float.valueOf(params[2]); - @Override - public void draw(String[] params, IWailaCommonAccessor accessor) { - float maxhearts = Float.valueOf(params[0]); - float health = Float.valueOf(params[1]); - float maxhealth = Float.valueOf(params[2]); + int heartsPerLine = (int) (Math.min(maxhearts, Math.ceil(maxhealth))); + int nlines = (int) (Math.ceil(maxhealth / maxhearts)); - int nhearts = MathHelper.ceiling_float_int(maxhealth); - int heartsPerLine = (int)(Math.min(maxhearts, Math.ceil(maxhealth))); - - int offsetX = 0; - int offsetY = 0; - - for (int iheart = 1; iheart <= nhearts; iheart++){ - - - if (iheart <= MathHelper.floor_float(health)){ - DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.HEART); - offsetX += 8; - } - - if ((iheart > health) && (iheart < health + 1)){ - DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.HHEART); - offsetX += 8; - } + return new Dimension(8 * heartsPerLine, 10 * nlines - 2); + } - if (iheart >= health + 1){ - DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.EHEART); - offsetX += 8; - } + @Override + public void draw(String[] params, IWailaCommonAccessor accessor) { + float maxhearts = Float.valueOf(params[0]); + float health = Float.valueOf(params[1]); + float maxhealth = Float.valueOf(params[2]); - if (iheart%heartsPerLine == 0){ - offsetY += 10; - offsetX = 0; - } - - } - } + int nhearts = MathHelper.ceiling_float_int(maxhealth); + int heartsPerLine = (int) (Math.min(maxhearts, Math.ceil(maxhealth))); + + int offsetX = 0; + int offsetY = 0; + + for (int iheart = 1; iheart <= nhearts; iheart++) { + + if (iheart <= MathHelper.floor_float(health)) { + DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.HEART); + offsetX += 8; + } + + if ((iheart > health) && (iheart < health + 1)) { + DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.HHEART); + offsetX += 8; + } + + if (iheart >= health + 1) { + DisplayUtil.renderIcon(offsetX, offsetY, 8, 8, IconUI.EHEART); + offsetX += 8; + } + + if (iheart % heartsPerLine == 0) { + offsetY += 10; + offsetX = 0; + } + + } + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderIcon.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderIcon.java index c9ed9d2..c4e8414 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderIcon.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderIcon.java @@ -5,32 +5,28 @@ import static mcp.mobius.waila.api.SpecialChars.WailaStyle; import java.awt.Dimension; -import org.lwjgl.opengl.GL11; - import mcp.mobius.waila.api.IWailaCommonAccessor; -import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.overlay.DisplayUtil; -import mcp.mobius.waila.overlay.OverlayRenderer; import mcp.mobius.waila.overlay.IconUI; public class TTRenderIcon implements IWailaTooltipRenderer { - final String type; - final int IconSize = 8; - - public TTRenderIcon(String type){ - this.type = type; - } - - @Override - public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { - return new Dimension(IconSize, IconSize); - } + final String type; + final int IconSize = 8; - @Override - public void draw(String[] params, IWailaCommonAccessor accessor) { - DisplayUtil.renderIcon(0, 0, IconSize, IconSize, IconUI.bySymbol(WailaStyle + WailaIcon + type)); - } + public TTRenderIcon(String type) { + this.type = type; + } + + @Override + public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { + return new Dimension(IconSize, IconSize); + } + + @Override + public void draw(String[] params, IWailaCommonAccessor accessor) { + DisplayUtil.renderIcon(0, 0, IconSize, IconSize, IconUI.bySymbol(WailaStyle + WailaIcon + type)); + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java index ab67a2b..fded166 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java @@ -2,34 +2,35 @@ package mcp.mobius.waila.overlay.tooltiprenderers; import java.awt.Dimension; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; import mcp.mobius.waila.api.IWailaCommonAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.overlay.DisplayUtil; -public class TTRenderProgressBar implements IWailaTooltipRenderer{ +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; - Minecraft mc = Minecraft.getMinecraft(); - ResourceLocation texture = new ResourceLocation("waila", "textures/sprites.png"); - - @Override - public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { - return new Dimension(32,16); - } +public class TTRenderProgressBar implements IWailaTooltipRenderer { - @Override - public void draw(String[] params, IWailaCommonAccessor accessor) { - int currentValue = Integer.valueOf(params[0]); - int maxValue = Integer.valueOf(params[1]); - - int progress = (currentValue * 28) / maxValue; - - this.mc.getTextureManager().bindTexture(texture); + Minecraft mc = Minecraft.getMinecraft(); + ResourceLocation texture = new ResourceLocation("waila", "textures/sprites.png"); - DisplayUtil.drawTexturedModalRect(4, 0, 4, 16, 28, 16, 28, 16); - DisplayUtil.drawTexturedModalRect(4, 0, 4, 0, progress + 1, 16, progress + 1, 16); + @Override + public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { + return new Dimension(32, 16); + } - } + @Override + public void draw(String[] params, IWailaCommonAccessor accessor) { + int currentValue = Integer.valueOf(params[0]); + int maxValue = Integer.valueOf(params[1]); + + int progress = (currentValue * 28) / maxValue; + + this.mc.getTextureManager().bindTexture(texture); + + DisplayUtil.drawTexturedModalRect(4, 0, 4, 16, 28, 16, 28, 16); + DisplayUtil.drawTexturedModalRect(4, 0, 4, 0, progress + 1, 16, progress + 1, 16); + + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java index e1a2601..ca57c11 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java @@ -2,37 +2,36 @@ package mcp.mobius.waila.overlay.tooltiprenderers; import java.awt.Dimension; +import mcp.mobius.waila.api.IWailaCommonAccessor; +import mcp.mobius.waila.api.IWailaTooltipRenderer; +import mcp.mobius.waila.overlay.DisplayUtil; + import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import mcp.mobius.waila.api.IWailaCommonAccessor; -import mcp.mobius.waila.api.IWailaTooltipRenderer; -import mcp.mobius.waila.overlay.DisplayUtil; -public class TTRenderStack implements IWailaTooltipRenderer{ +public class TTRenderStack implements IWailaTooltipRenderer { - @Override - public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { - return new Dimension(16,16); - } + @Override + public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { + return new Dimension(16, 16); + } - @Override - public void draw(String[] params, IWailaCommonAccessor accessor) { - int type = Integer.valueOf(params[0]); //0 for block, 1 for item - String name = params[1]; //Fully qualified name - int amount = Integer.valueOf(params[2]); - int meta = Integer.valueOf(params[3]); - - ItemStack stack = null; - if (type == 0) - stack = new ItemStack((Block)Block.blockRegistry.getObject(name), amount, meta); - if (type == 1) - stack = new ItemStack((Item)Item.itemRegistry.getObject(name), amount, meta); - - RenderHelper.enableGUIStandardItemLighting(); - DisplayUtil.renderStack(0, 0, stack); - RenderHelper.disableStandardItemLighting(); - } + @Override + public void draw(String[] params, IWailaCommonAccessor accessor) { + int type = Integer.valueOf(params[0]); // 0 for block, 1 for item + String name = params[1]; // Fully qualified name + int amount = Integer.valueOf(params[2]); + int meta = Integer.valueOf(params[3]); + + ItemStack stack = null; + if (type == 0) stack = new ItemStack((Block) Block.blockRegistry.getObject(name), amount, meta); + if (type == 1) stack = new ItemStack((Item) Item.itemRegistry.getObject(name), amount, meta); + + RenderHelper.enableGUIStandardItemLighting(); + DisplayUtil.renderStack(0, 0, stack); + RenderHelper.disableStandardItemLighting(); + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java index e32a7cf..cf68bb9 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderString.java @@ -1,34 +1,30 @@ - package mcp.mobius.waila.overlay.tooltiprenderers; +package mcp.mobius.waila.overlay.tooltiprenderers; import java.awt.Dimension; -import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaCommonAccessor; -import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; -import mcp.mobius.waila.gui.truetyper.FontHelper; -import mcp.mobius.waila.gui.truetyper.TrueTypeFont; import mcp.mobius.waila.overlay.DisplayUtil; import mcp.mobius.waila.overlay.OverlayConfig; -public class TTRenderString implements IWailaTooltipRenderer{ +public class TTRenderString implements IWailaTooltipRenderer { - final String data; - final Dimension size; - - public TTRenderString(String data){ - this.data = data; - this.size = new Dimension(DisplayUtil.getDisplayWidth(data), data.equals("") ? 0 : 8); - } - - @Override - public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { - return size; - } + final String data; + final Dimension size; - @Override - public void draw(String[] params, IWailaCommonAccessor accessor) { - DisplayUtil.drawString(data, 0, 0, OverlayConfig.fontcolor, true); - } + public TTRenderString(String data) { + this.data = data; + this.size = new Dimension(DisplayUtil.getDisplayWidth(data), data.equals("") ? 0 : 8); + } + + @Override + public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { + return size; + } + + @Override + public void draw(String[] params, IWailaCommonAccessor accessor) { + DisplayUtil.drawString(data, 0, 0, OverlayConfig.fontcolor, true); + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java index d1ca58e..c3f87b9 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderTrueTyper.java @@ -9,24 +9,37 @@ import mcp.mobius.waila.gui.truetyper.FontHelper; import mcp.mobius.waila.gui.truetyper.TrueTypeFont; import mcp.mobius.waila.overlay.DisplayUtil; -public class TTRenderTrueTyper implements IWailaTooltipRenderer{ +public class TTRenderTrueTyper implements IWailaTooltipRenderer { - final String data; - final Dimension size; - - public TTRenderTrueTyper(String data){ - this.data = data; - this.size = new Dimension(DisplayUtil.getDisplayWidth(data), data.equals("") ? 0 : (int)((TrueTypeFont)Waila.proxy.getFont()).getHeight()/2); - } - - @Override - public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { - return size; - } + final String data; + final Dimension size; + + public TTRenderTrueTyper(String data) { + this.data = data; + this.size = new Dimension( + DisplayUtil.getDisplayWidth(data), + data.equals("") ? 0 : (int) ((TrueTypeFont) Waila.proxy.getFont()).getHeight() / 2); + } + + @Override + public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { + return size; + } + + @Override + public void draw(String[] params, IWailaCommonAccessor accessor) { + FontHelper.drawString( + data, + 0f, + 0f, + (TrueTypeFont) Waila.proxy.getFont(), + 1.0f, + 1.0f, + 0.0f, + 1.0f, + 1.0f, + 1.0f, + 1.0f); + } - @Override - public void draw(String[] params, IWailaCommonAccessor accessor) { - FontHelper.drawString(data, 0f, 0f, (TrueTypeFont)Waila.proxy.getFont(), 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f); - } - } diff --git a/src/main/java/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java index 52c81e0..125de5e 100644 --- a/src/main/java/mcp/mobius/waila/server/ProxyServer.java +++ b/src/main/java/mcp/mobius/waila/server/ProxyServer.java @@ -1,6 +1,7 @@ package mcp.mobius.waila.server; -import cpw.mods.fml.common.Loader; +import java.lang.reflect.Method; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.addons.agriculture.AgricultureModule; import mcp.mobius.waila.addons.buildcraft.BCModule; @@ -27,121 +28,121 @@ import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.handlers.DecoratorFMP; import mcp.mobius.waila.handlers.HUDHandlerFMP; - -import java.lang.reflect.Method; +import cpw.mods.fml.common.Loader; public class ProxyServer { - public ProxyServer() {} + public ProxyServer() {} - public void registerHandlers(){} - - public void registerMods(){ - - HUDHandlerVanilla.register(); - HUDHandlerFurnace.register(); - - /* BUILDCRAFT */ - BCModule.register(); - - /* INDUSTRIALCRAFT2 */ - IC2Module.register(); - - /*Thaumcraft*/ - ThaumcraftModule.register(); - - /*EnderStorage*/ - EnderStorageModule.register(); - - /*Gravestone*/ - GravestoneModule.register(); - - /*Twilight forest*/ - TwilightForestModule.register(); - - /* Thermal Expansion */ - ThermalExpansionModule.register(); + public void registerHandlers() {} - /* Thermal Dynamics */ - ThermalDynamicsModule.register(); - - /* ETB */ - ETBModule.register(); - - /* EnderIO */ - //EnderIOModule.register(); - - /* ProjectRed API */ - ProjectRedModule.register(); - - /* ExtraUtilities */ - ExtraUtilitiesModule.register(); - - /* OpenBlocks */ - OpenBlocksModule.register(); - - /* Railcraft */ - RailcraftModule.register(); - - /* Steve's Carts */ - StevesCartsModule.register(); - - /* Secret Rooms */ - //SecretRoomsModule.register(); - - /* Carpenter's Blocks */ - CarpentersModule.register(); + public void registerMods() { - /* 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); - } - - public void registerIMCs(){ - for (String s : ModuleRegistrar.instance().IMCRequests.keySet()){ - this.callbackRegistration(s, ModuleRegistrar.instance().IMCRequests.get(s)); - } - } - - public void callbackRegistration(String method, String modname){ - String[] splitName = method.split("\\."); - String methodName = splitName[splitName.length-1]; - String className = method.substring(0, method.length()-methodName.length()-1); - - Waila.log.info(String.format("Trying to reflect %s %s", className, methodName)); - - try{ - Class reflectClass = Class.forName(className); - Method reflectMethod = reflectClass.getDeclaredMethod(methodName, IWailaRegistrar.class); - reflectMethod.invoke(null, (IWailaRegistrar)ModuleRegistrar.instance()); - - Waila.log.info(String.format("Success in registering %s", modname)); - - } catch (ClassNotFoundException e){ - Waila.log.warn(String.format("Could not find class %s", className)); - } catch (NoSuchMethodException e){ - Waila.log.warn(String.format("Could not find method %s", methodName)); - } catch (Exception e){ - Waila.log.warn(String.format("Exception while trying to access the method : %s", e.toString())); - } - } - - - public Object getFont(){return null;} + HUDHandlerVanilla.register(); + HUDHandlerFurnace.register(); + + /* BUILDCRAFT */ + BCModule.register(); + + /* INDUSTRIALCRAFT2 */ + IC2Module.register(); + + /* Thaumcraft */ + ThaumcraftModule.register(); + + /* EnderStorage */ + EnderStorageModule.register(); + + /* Gravestone */ + GravestoneModule.register(); + + /* Twilight forest */ + TwilightForestModule.register(); + + /* Thermal Expansion */ + ThermalExpansionModule.register(); + + /* Thermal Dynamics */ + ThermalDynamicsModule.register(); + + /* ETB */ + ETBModule.register(); + + /* EnderIO */ + // EnderIOModule.register(); + + /* ProjectRed API */ + ProjectRedModule.register(); + + /* ExtraUtilities */ + ExtraUtilitiesModule.register(); + + /* OpenBlocks */ + OpenBlocksModule.register(); + + /* Railcraft */ + 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); + } + + public void registerIMCs() { + for (String s : ModuleRegistrar.instance().IMCRequests.keySet()) { + this.callbackRegistration(s, ModuleRegistrar.instance().IMCRequests.get(s)); + } + } + + public void callbackRegistration(String method, String modname) { + String[] splitName = method.split("\\."); + String methodName = splitName[splitName.length - 1]; + String className = method.substring(0, method.length() - methodName.length() - 1); + + Waila.log.info(String.format("Trying to reflect %s %s", className, methodName)); + + try { + Class reflectClass = Class.forName(className); + Method reflectMethod = reflectClass.getDeclaredMethod(methodName, IWailaRegistrar.class); + reflectMethod.invoke(null, (IWailaRegistrar) ModuleRegistrar.instance()); + + Waila.log.info(String.format("Success in registering %s", modname)); + + } catch (ClassNotFoundException e) { + Waila.log.warn(String.format("Could not find class %s", className)); + } catch (NoSuchMethodException e) { + Waila.log.warn(String.format("Could not find method %s", methodName)); + } catch (Exception e) { + Waila.log.warn(String.format("Exception while trying to access the method : %s", e.toString())); + } + } + + public Object getFont() { + return null; + } } diff --git a/src/main/java/mcp/mobius/waila/utils/AccessHelper.java b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java index 1224b6b..377c8ae 100644 --- a/src/main/java/mcp/mobius/waila/utils/AccessHelper.java +++ b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java @@ -8,6 +8,7 @@ import java.util.ArrayList; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaEntityProvider; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -19,150 +20,134 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class AccessHelper { - public static Field getDeclaredField(String classname, String fieldname){ - - try { - Class class_ = Class.forName(classname); - Field field_ = class_.getDeclaredField(fieldname); - field_.setAccessible(true); - //mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); - return field_; - } - catch (NoSuchFieldException e) { - Waila.log.warn(String.format("== Field %s %s not found !\n", classname, fieldname)); - return null; - } - catch (SecurityException e) { - Waila.log.warn(String.format("== Field %s %s security exception !\n", classname, fieldname)); - return null; - } - catch (ClassNotFoundException e) { - Waila.log.warn(String.format("== Class %s not found !\n", classname)); - return null; - } - } - public static Object getField(String classname, String fieldname, Object instance){ - - try { - Class class_ = Class.forName(classname); - Field field_ = class_.getDeclaredField(fieldname); - field_.setAccessible(true); - - //mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); - return field_.get(instance); - } - catch (NoSuchFieldException e) { - Waila.log.warn(String.format("== Field %s %s not found !\n", classname, fieldname)); - return null; - } - catch (SecurityException e) { - Waila.log.warn(String.format("== Field %s %s security exception !\n", classname, fieldname)); - return null; - } - catch (ClassNotFoundException e) { - Waila.log.warn(String.format("== Class %s not found !\n", classname)); - return null; - } catch (IllegalArgumentException e) { - Waila.log.warn(String.format("== %s\n", e)); - return null; - } catch (IllegalAccessException e) { - Waila.log.warn(String.format("== %s\n", e)); - return null; - } - } - - - public static Object getFieldExcept(String classname, String fieldname, Object instance) throws Exception{ - Class class_ = Class.forName(classname); - Field field_ = class_.getDeclaredField(fieldname); - field_.setAccessible(true); - - //mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); - return field_.get(instance); - } - - - public static Block getBlock(String classname, String fieldname){ - Field field_ = getDeclaredField(classname, fieldname); - try{ - return (Block)field_.get(Block.class); - } catch (Exception e) { - System.out.printf("%s\n", e); - Waila.log.warn(String.format("== ERROR GETTING BLOCK %s %s\n", classname, fieldname)); - return null; - } - } + public static Field getDeclaredField(String classname, String fieldname) { - public static Item getItem(String classname, String fieldname){ - Field field_ = getDeclaredField(classname, fieldname); - try{ - return (Item)field_.get(Item.class); - } catch (Exception e) { - System.out.printf("%s\n", e); - Waila.log.warn(String.format("== ERROR GETTING ITEM %s %s\n", classname, fieldname)); - return null; - } - } - - public static ArrayList getCraftingRecipes(ItemStack stack){ - ArrayList recipes = new ArrayList(); - - for (IRecipe recipe : (ArrayList)CraftingManager.getInstance().getRecipeList()){ - if (recipe != null && recipe.getRecipeOutput() != null){ - if (recipe.getRecipeOutput().isItemEqual(stack)) - recipes.add(recipe); - } - } - - return recipes; - } - - public static void cleanCraftingRecipes(ItemStack stack){ - for (IRecipe recipe: getCraftingRecipes(stack)){ - CraftingManager.getInstance().getRecipeList().remove(recipe); - } - } + try { + Class class_ = Class.forName(classname); + Field field_ = class_.getDeclaredField(fieldname); + field_.setAccessible(true); + // mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); + return field_; + } catch (NoSuchFieldException e) { + Waila.log.warn(String.format("== Field %s %s not found !\n", classname, fieldname)); + return null; + } catch (SecurityException e) { + Waila.log.warn(String.format("== Field %s %s security exception !\n", classname, fieldname)); + return null; + } catch (ClassNotFoundException e) { + Waila.log.warn(String.format("== Class %s not found !\n", classname)); + return null; + } + } - public static NBTTagCompound getNBTData(IWailaDataProvider provider, TileEntity entity, NBTTagCompound tag, World world, int x, int y, int z) throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException{ - Method getNBTData = provider.getClass().getMethod("getNBTData", TileEntity.class, NBTTagCompound.class, World.class, int.class, int.class, int.class); - return (NBTTagCompound)getNBTData.invoke(provider, entity, tag, world, x, y, z); - } + public static Object getField(String classname, String fieldname, Object instance) { - public static NBTTagCompound getNBTData(IWailaEntityProvider provider, Entity entity, NBTTagCompound tag) throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException{ - Method getNBTData = provider.getClass().getMethod("getNBTData", Entity.class, NBTTagCompound.class); - return (NBTTagCompound)getNBTData.invoke(provider, entity, tag); - } - - /* - public static void cleanSmeltingRecipes(ItemStack stack){ - Map smeltingList = FurnaceRecipes.smelting().getSmeltingList(); - Map, ItemStack> smeltingListMeta = FurnaceRecipes.smelting().getMetaSmeltingList(); - - HashMap matchingRecipes = new HashMap(); - HashMap, ItemStack> matchingRecipesMeta = new HashMap, ItemStack>(); - - // We walk the none meta list to find all the recipes - for (Object id_ : smeltingList.keySet()){ - Integer id = (Integer)id_; - ItemStack result = (ItemStack)smeltingList.get(id_); - - if (stack.isItemEqual(result)) - matchingRecipes.put(id, result); - } + try { + Class class_ = Class.forName(classname); + Field field_ = class_.getDeclaredField(fieldname); + field_.setAccessible(true); - for (List key : smeltingListMeta.keySet()){ - ItemStack result = smeltingListMeta.get(key); - - if (stack.isItemEqual(result)) - matchingRecipesMeta.put(key, result); - } - - for (Integer key : matchingRecipes.keySet()) - FurnaceRecipes.smelting().getSmeltingList().remove(key); + // mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); + return field_.get(instance); + } catch (NoSuchFieldException e) { + Waila.log.warn(String.format("== Field %s %s not found !\n", classname, fieldname)); + return null; + } catch (SecurityException e) { + Waila.log.warn(String.format("== Field %s %s security exception !\n", classname, fieldname)); + return null; + } catch (ClassNotFoundException e) { + Waila.log.warn(String.format("== Class %s not found !\n", classname)); + return null; + } catch (IllegalArgumentException e) { + Waila.log.warn(String.format("== %s\n", e)); + return null; + } catch (IllegalAccessException e) { + Waila.log.warn(String.format("== %s\n", e)); + return null; + } + } - for (List key : matchingRecipesMeta.keySet()) - FurnaceRecipes.smelting().getMetaSmeltingList().remove(key); - } - */ + public static Object getFieldExcept(String classname, String fieldname, Object instance) throws Exception { + Class class_ = Class.forName(classname); + Field field_ = class_.getDeclaredField(fieldname); + field_.setAccessible(true); + + // mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); + return field_.get(instance); + } + + public static Block getBlock(String classname, String fieldname) { + Field field_ = getDeclaredField(classname, fieldname); + try { + return (Block) field_.get(Block.class); + } catch (Exception e) { + System.out.printf("%s\n", e); + Waila.log.warn(String.format("== ERROR GETTING BLOCK %s %s\n", classname, fieldname)); + return null; + } + } + + public static Item getItem(String classname, String fieldname) { + Field field_ = getDeclaredField(classname, fieldname); + try { + return (Item) field_.get(Item.class); + } catch (Exception e) { + System.out.printf("%s\n", e); + Waila.log.warn(String.format("== ERROR GETTING ITEM %s %s\n", classname, fieldname)); + return null; + } + } + + public static ArrayList getCraftingRecipes(ItemStack stack) { + ArrayList recipes = new ArrayList(); + + for (IRecipe recipe : (ArrayList) CraftingManager.getInstance().getRecipeList()) { + if (recipe != null && recipe.getRecipeOutput() != null) { + if (recipe.getRecipeOutput().isItemEqual(stack)) recipes.add(recipe); + } + } + + return recipes; + } + + public static void cleanCraftingRecipes(ItemStack stack) { + for (IRecipe recipe : getCraftingRecipes(stack)) { + CraftingManager.getInstance().getRecipeList().remove(recipe); + } + } + + public static NBTTagCompound getNBTData(IWailaDataProvider provider, TileEntity entity, NBTTagCompound tag, + World world, int x, int y, int z) throws NoSuchMethodException, SecurityException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException { + Method getNBTData = provider.getClass().getMethod( + "getNBTData", + TileEntity.class, + NBTTagCompound.class, + World.class, + int.class, + int.class, + int.class); + return (NBTTagCompound) getNBTData.invoke(provider, entity, tag, world, x, y, z); + } + + public static NBTTagCompound getNBTData(IWailaEntityProvider provider, Entity entity, NBTTagCompound tag) + throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, + InvocationTargetException { + Method getNBTData = provider.getClass().getMethod("getNBTData", Entity.class, NBTTagCompound.class); + return (NBTTagCompound) getNBTData.invoke(provider, entity, tag); + } + + /* + * public static void cleanSmeltingRecipes(ItemStack stack){ Map smeltingList = + * FurnaceRecipes.smelting().getSmeltingList(); Map, ItemStack> smeltingListMeta = + * FurnaceRecipes.smelting().getMetaSmeltingList(); HashMap matchingRecipes = new + * HashMap(); HashMap, ItemStack> matchingRecipesMeta = new HashMap, + * ItemStack>(); // We walk the none meta list to find all the recipes for (Object id_ : smeltingList.keySet()){ + * Integer id = (Integer)id_; ItemStack result = (ItemStack)smeltingList.get(id_); if (stack.isItemEqual(result)) + * matchingRecipes.put(id, result); } for (List key : smeltingListMeta.keySet()){ ItemStack result = + * smeltingListMeta.get(key); if (stack.isItemEqual(result)) matchingRecipesMeta.put(key, result); } for (Integer + * key : matchingRecipes.keySet()) FurnaceRecipes.smelting().getSmeltingList().remove(key); for (List key : + * matchingRecipesMeta.keySet()) FurnaceRecipes.smelting().getMetaSmeltingList().remove(key); } + */ } diff --git a/src/main/java/mcp/mobius/waila/utils/Constants.java b/src/main/java/mcp/mobius/waila/utils/Constants.java index 9118d6b..f440279 100644 --- a/src/main/java/mcp/mobius/waila/utils/Constants.java +++ b/src/main/java/mcp/mobius/waila/utils/Constants.java @@ -1,44 +1,45 @@ package mcp.mobius.waila.utils; public final class Constants { - public static String BIND_SCREEN_WIKI = "showwiki"; - public static String BIND_SCREEN_TECH = "showtechtree"; - public static String BIND_SCREEN_ENCH = "showenchant"; - public static String BIND_WAILA_CFG = "waila.keybind.wailaconfig"; - public static String BIND_WAILA_SHOW = "waila.keybind.wailadisplay"; - public static String BIND_WAILA_LIQUID = "waila.keybind.liquid"; - public static String BIND_WAILA_RECIPE = "waila.keybind.recipe"; - public static String BIND_WAILA_USAGE = "waila.keybind.usage"; - public static String BIND_WAILA_TESTING= "waila.keybind.testing"; - - public static String CFG_NEI_SHOW = "world.highlight_tips"; - public static String BIND_NEI_SHOW = "keys.world.highlight_tips"; + public static String BIND_SCREEN_WIKI = "showwiki"; + public static String BIND_SCREEN_TECH = "showtechtree"; + public static String BIND_SCREEN_ENCH = "showenchant"; + + public static String BIND_WAILA_CFG = "waila.keybind.wailaconfig"; + public static String BIND_WAILA_SHOW = "waila.keybind.wailadisplay"; + public static String BIND_WAILA_LIQUID = "waila.keybind.liquid"; + public static String BIND_WAILA_RECIPE = "waila.keybind.recipe"; + public static String BIND_WAILA_USAGE = "waila.keybind.usage"; + public static String BIND_WAILA_TESTING = "waila.keybind.testing"; + + public static String CFG_NEI_SHOW = "world.highlight_tips"; + public static String BIND_NEI_SHOW = "keys.world.highlight_tips"; + + public static boolean CFG_DEFAULT_VALUE = true; + public static String CFG_WAILA_SHOW = "waila.cfg.show"; + public static String CFG_WAILA_MODE = "waila.cfg.showmode"; + public static String CFG_WAILA_LIQUID = "waila.cfg.liquid"; + public static String CFG_WAILA_METADATA = "waila.cfg.metadata"; + public static String CFG_WAILA_KEYBIND = "waila.cfg.keybind"; + public static String CFG_WAILA_POSX = "waila.cfg.posx"; + public static String CFG_WAILA_POSY = "waila.cfg.posy"; + public static String CFG_WAILA_SCALE = "waila.cfg.scale"; + public static String CFG_WAILA_SHIFTBLOCK = "waila.cfg.shiftblock"; + public static String CFG_WAILA_SHIFTENTS = "waila.cfg.shiftents"; + public static String CFG_WAILA_NHEARTS = "waila.cfg.heartsperline"; + public static String CFG_WAILA_MAXHP = "waila.cfg.maxhpbeforetext"; + public static String CFG_WAILA_NEWFILTERS = "waila.cfg.newfilters"; + + public static String CFG_WAILA_ALPHA = "waila.cfg.alpha"; + public static String CFG_WAILA_BGCOLOR = "waila.cfg.bgcolor"; + public static String CFG_WAILA_GRADIENT1 = "waila.cfg.gradient1"; + public static String CFG_WAILA_GRADIENT2 = "waila.cfg.gradient2"; + public static String CFG_WAILA_FONTCOLOR = "waila.cfg.fontcolor"; + + public static String CATEGORY_MODULES = "modules"; + public static String CATEGORY_SERVER = "server_forcing"; + public static boolean SERVER_FREE = false; + public static boolean SERVER_FORCED = true; - public static boolean CFG_DEFAULT_VALUE = true; - public static String CFG_WAILA_SHOW = "waila.cfg.show"; - public static String CFG_WAILA_MODE = "waila.cfg.showmode"; - public static String CFG_WAILA_LIQUID = "waila.cfg.liquid"; - public static String CFG_WAILA_METADATA = "waila.cfg.metadata"; - public static String CFG_WAILA_KEYBIND = "waila.cfg.keybind"; - public static String CFG_WAILA_POSX = "waila.cfg.posx"; - public static String CFG_WAILA_POSY = "waila.cfg.posy"; - public static String CFG_WAILA_SCALE = "waila.cfg.scale"; - public static String CFG_WAILA_SHIFTBLOCK = "waila.cfg.shiftblock"; - public static String CFG_WAILA_SHIFTENTS = "waila.cfg.shiftents"; - public static String CFG_WAILA_NHEARTS = "waila.cfg.heartsperline"; - public static String CFG_WAILA_MAXHP = "waila.cfg.maxhpbeforetext"; - public static String CFG_WAILA_NEWFILTERS = "waila.cfg.newfilters"; - - public static String CFG_WAILA_ALPHA = "waila.cfg.alpha"; - public static String CFG_WAILA_BGCOLOR = "waila.cfg.bgcolor"; - public static String CFG_WAILA_GRADIENT1 = "waila.cfg.gradient1"; - public static String CFG_WAILA_GRADIENT2 = "waila.cfg.gradient2"; - public static String CFG_WAILA_FONTCOLOR = "waila.cfg.fontcolor"; - - public static String CATEGORY_MODULES = "modules"; - public static String CATEGORY_SERVER = "server_forcing"; - public static boolean SERVER_FREE = false; - public static boolean SERVER_FORCED = true; - } diff --git a/src/main/java/mcp/mobius/waila/utils/ModIdentification.java b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java index b7686c8..046e078 100644 --- a/src/main/java/mcp/mobius/waila/utils/ModIdentification.java +++ b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java @@ -3,139 +3,107 @@ package mcp.mobius.waila.utils; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.HashMap; + import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; public class ModIdentification { - - public static HashMap modSource_Name = new HashMap(); - public static HashMap modSource_ID = new HashMap(); - public static HashMap itemMap = new HashMap(); - public static HashMap keyhandlerStrings = new HashMap(); - - public static void init(){ - //TODO : Redo this for the new frameworkn (1.7.2) - /* - NBTTagList itemDataList = new NBTTagList(); - GameData.writeItemData(itemDataList); - - for(int i = 0; i < itemDataList.tagCount(); i++) - { - ItemData itemData = new ItemData((NBTTagCompound) itemDataList.tagAt(i)); - itemMap.put(itemData.getItemId(), itemData.getModId()); - } - */ - - for (ModContainer mod : Loader.instance().getModList()){ - modSource_Name.put(mod.getSource().getName(), mod.getName()); - modSource_ID.put(mod.getSource().getName(), mod.getModId()); + public static HashMap modSource_Name = new HashMap(); + public static HashMap modSource_ID = new HashMap(); + public static HashMap itemMap = new HashMap(); + public static HashMap keyhandlerStrings = new HashMap(); + + public static void init() { + + // TODO : Redo this for the new frameworkn (1.7.2) + /* + * NBTTagList itemDataList = new NBTTagList(); GameData.writeItemData(itemDataList); for(int i = 0; i < + * itemDataList.tagCount(); i++) { ItemData itemData = new ItemData((NBTTagCompound) itemDataList.tagAt(i)); + * itemMap.put(itemData.getItemId(), itemData.getModId()); } + */ + + for (ModContainer mod : Loader.instance().getModList()) { + modSource_Name.put(mod.getSource().getName(), mod.getName()); + modSource_ID.put(mod.getSource().getName(), mod.getModId()); } - //TODO : Update this to match new version (1.7.2) + // TODO : Update this to match new version (1.7.2) modSource_Name.put("1.6.2.jar", "Minecraft"); - modSource_Name.put("1.6.3.jar", "Minecraft"); + modSource_Name.put("1.6.3.jar", "Minecraft"); modSource_Name.put("1.6.4.jar", "Minecraft"); modSource_Name.put("1.7.2.jar", "Minecraft"); - modSource_Name.put("Forge", "Minecraft"); + modSource_Name.put("Forge", "Minecraft"); modSource_ID.put("1.6.2.jar", "Minecraft"); - modSource_ID.put("1.6.3.jar", "Minecraft"); + modSource_ID.put("1.6.3.jar", "Minecraft"); modSource_ID.put("1.6.4.jar", "Minecraft"); modSource_ID.put("1.7.2.jar", "Minecraft"); - modSource_ID.put("Forge", "Minecraft"); - - -// for (String s : this.modSourceList.keySet()) -// if (this.modSourceList.get(s) == "Minecraft Coder Pack") -// this.modSourceList.put(s, "Minecraft"); - + modSource_ID.put("Forge", "Minecraft"); + + // for (String s : this.modSourceList.keySet()) + // if (this.modSourceList.get(s) == "Minecraft Coder Pack") + // this.modSourceList.put(s, "Minecraft"); + // Code to retrieve all the registered keybindings along with the mod adding them. /* - Field keyHandlers_Field = AccessHelper.getDeclaredField("cpw.mods.fml.client.registry.KeyBindingRegistry", "keyHandlers"); - try { - Set keyHandlers = (Set)keyHandlers_Field.get(KeyBindingRegistry.instance()); - for (KeyHandler keyhandler : keyHandlers) - for (int i = 0; i < keyhandler.getKeyBindings().length; i++) - keyhandlerStrings.put(keyhandler.getKeyBindings()[i].keyDescription, idFromObject(keyhandler)); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - */ - - } - - public static String nameFromObject(Object obj){ - String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); - - try { - objPath = URLDecoder.decode(objPath, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - String modName = ""; - for (String s: modSource_Name.keySet()) - if (objPath.contains(s)){ - modName = modSource_Name.get(s); - break; - } - - if (modName.equals("Minecraft Coder Pack")) - modName = "Minecraft"; - - return modName; - } - - /* - public static String idFromObject(Object obj){ - String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); - - try { - objPath = URLDecoder.decode(objPath, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - - String modName = ""; - for (String s: modSource_ID.keySet()) - if (objPath.contains(s)){ - modName = modSource_ID.get(s); - break; - } - - if (modName.equals("Minecraft Coder Pack")) - modName = "Minecraft"; - - return modName; - } - */ - - public static String nameFromStack(ItemStack stack){ - try{ - //String modID = itemMap.get(itemstack.itemID); - //ModContainer mod = ModIdentification.findModContainer(modID); - ModContainer mod = GameData.findModOwner(GameData.itemRegistry.getNameForObject(stack.getItem())); - String modname = mod == null ? "Minecraft" : mod.getName(); - return modname; - } catch (NullPointerException e){ - //System.out.printf("NPE : %s\n",itemstack.toString()); - return ""; - } - } + * Field keyHandlers_Field = AccessHelper.getDeclaredField("cpw.mods.fml.client.registry.KeyBindingRegistry", + * "keyHandlers"); try { Set keyHandlers = + * (Set)keyHandlers_Field.get(KeyBindingRegistry.instance()); for (KeyHandler keyhandler : + * keyHandlers) for (int i = 0; i < keyhandler.getKeyBindings().length; i++) + * keyhandlerStrings.put(keyhandler.getKeyBindings()[i].keyDescription, idFromObject(keyhandler)); } catch + * (IllegalArgumentException e) { e.printStackTrace(); } catch (IllegalAccessException e) { e.printStackTrace(); + * } + */ - /* - public static ModContainer findModContainer(String modID) - { - for(ModContainer mc : Loader.instance().getModList()) - if(modID.equals(mc.getModId())) - return mc; - - return null; } - */ + + public static String nameFromObject(Object obj) { + String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); + + try { + objPath = URLDecoder.decode(objPath, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + String modName = ""; + for (String s : modSource_Name.keySet()) if (objPath.contains(s)) { + modName = modSource_Name.get(s); + break; + } + + if (modName.equals("Minecraft Coder Pack")) modName = "Minecraft"; + + return modName; + } + + /* + * public static String idFromObject(Object obj){ String objPath = + * obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); try { objPath = + * URLDecoder.decode(objPath, "UTF-8"); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } String + * modName = ""; for (String s: modSource_ID.keySet()) if (objPath.contains(s)){ modName = + * modSource_ID.get(s); break; } if (modName.equals("Minecraft Coder Pack")) modName = "Minecraft"; return modName; + * } + */ + + public static String nameFromStack(ItemStack stack) { + try { + // String modID = itemMap.get(itemstack.itemID); + // ModContainer mod = ModIdentification.findModContainer(modID); + ModContainer mod = GameData.findModOwner(GameData.itemRegistry.getNameForObject(stack.getItem())); + String modname = mod == null ? "Minecraft" : mod.getName(); + return modname; + } catch (NullPointerException e) { + // System.out.printf("NPE : %s\n",itemstack.toString()); + return ""; + } + } + + /* + * public static ModContainer findModContainer(String modID) { for(ModContainer mc : Loader.instance().getModList()) + * if(modID.equals(mc.getModId())) return mc; return null; } + */ } diff --git a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java index 297c9c1..f68585c 100644 --- a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java +++ b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java @@ -15,102 +15,89 @@ import net.minecraft.nbt.NBTTagShort; public class NBTUtil { - public static NBTBase getTag(String key, NBTTagCompound tag){ - String[] path = key.split("\\."); - - NBTTagCompound deepTag = tag; - for (String i : path){ - if (deepTag.hasKey(i)){ - if (deepTag.getTag(i) instanceof NBTTagCompound) - deepTag = deepTag.getCompoundTag(i); - else{ - return deepTag.getTag(i); - } - } else { - //Waila.log.log(Level.WARN, "Leaf " + key + " not found."); - return null; - } - } - return deepTag; - } - - public static NBTTagCompound setTag(String key, NBTTagCompound targetTag, NBTBase addedTag){ - String[] path = key.split("\\."); - - NBTTagCompound deepTag = targetTag; - for (int i = 0; i < path.length - 1; i++){ - if (!deepTag.hasKey(path[i])) - //deepTag.setCompoundTag(path[i], new NBTTagCompound()); - deepTag.setTag(path[i], new NBTTagCompound()); - - deepTag = deepTag.getCompoundTag(path[i]); - } - - deepTag.setTag(path[path.length - 1], addedTag); - - return targetTag; - } - - public static NBTTagCompound createTag(NBTTagCompound inTag, HashSet keys){ - if (keys.contains("*")) return inTag; - - NBTTagCompound outTag = new NBTTagCompound(); - - for (String key : keys){ - NBTBase tagToAdd = getTag(key, inTag); - //System.out.printf("%s\n", tagToAdd); - if (tagToAdd != null) - outTag = setTag(key, outTag, tagToAdd); - } - - return outTag; - } - - public static void writeNBTTagCompound(NBTTagCompound par0NBTTagCompound, DataOutputStream par1DataOutputStream) throws IOException - { - if (par0NBTTagCompound == null) - { - par1DataOutputStream.writeShort(-1); - } - else - { - byte[] abyte = CompressedStreamTools.compress(par0NBTTagCompound); - - if (abyte.length > 32000) - par1DataOutputStream.writeShort(-1); - else{ - par1DataOutputStream.writeShort((short)abyte.length); - par1DataOutputStream.write(abyte); + public static NBTBase getTag(String key, NBTTagCompound tag) { + String[] path = key.split("\\."); + + NBTTagCompound deepTag = tag; + for (String i : path) { + if (deepTag.hasKey(i)) { + if (deepTag.getTag(i) instanceof NBTTagCompound) deepTag = deepTag.getCompoundTag(i); + else { + return deepTag.getTag(i); + } + } else { + // Waila.log.log(Level.WARN, "Leaf " + key + " not found."); + return null; } } - } + return deepTag; + } - public static NBTTagCompound readNBTTagCompound(DataInputStream par0DataInputStream) throws IOException - { + public static NBTTagCompound setTag(String key, NBTTagCompound targetTag, NBTBase addedTag) { + String[] path = key.split("\\."); + + NBTTagCompound deepTag = targetTag; + for (int i = 0; i < path.length - 1; i++) { + if (!deepTag.hasKey(path[i])) + // deepTag.setCompoundTag(path[i], new NBTTagCompound()); + deepTag.setTag(path[i], new NBTTagCompound()); + + deepTag = deepTag.getCompoundTag(path[i]); + } + + deepTag.setTag(path[path.length - 1], addedTag); + + return targetTag; + } + + public static NBTTagCompound createTag(NBTTagCompound inTag, HashSet keys) { + if (keys.contains("*")) return inTag; + + NBTTagCompound outTag = new NBTTagCompound(); + + for (String key : keys) { + NBTBase tagToAdd = getTag(key, inTag); + // System.out.printf("%s\n", tagToAdd); + if (tagToAdd != null) outTag = setTag(key, outTag, tagToAdd); + } + + return outTag; + } + + public static void writeNBTTagCompound(NBTTagCompound par0NBTTagCompound, DataOutputStream par1DataOutputStream) + throws IOException { + if (par0NBTTagCompound == null) { + par1DataOutputStream.writeShort(-1); + } else { + byte[] abyte = CompressedStreamTools.compress(par0NBTTagCompound); + + if (abyte.length > 32000) par1DataOutputStream.writeShort(-1); + else { + par1DataOutputStream.writeShort((short) abyte.length); + par1DataOutputStream.write(abyte); + } + } + } + + public static NBTTagCompound readNBTTagCompound(DataInputStream par0DataInputStream) throws IOException { short short1 = par0DataInputStream.readShort(); - if (short1 < 0) - { + if (short1 < 0) { return null; - } - else - { + } else { byte[] abyte = new byte[short1]; par0DataInputStream.readFully(abyte); return CompressedStreamTools.func_152457_a(abyte, NBTSizeTracker.field_152451_a); } - } - - public static 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); + } + + public static 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 0; - } - } diff --git a/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java index 4c57b5e..311b326 100644 --- a/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java +++ b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java @@ -3,31 +3,32 @@ package mcp.mobius.waila.utils; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.Level; - import mcp.mobius.waila.Waila; +import org.apache.logging.log4j.Level; + public class WailaExceptionHandler { - public WailaExceptionHandler() {} - - private static ArrayList errs = new ArrayList(); - - public static List handleErr(Throwable e, String className, List currenttip){ - if (!errs.contains(className)){ - errs.add(className); - - for (StackTraceElement elem : e.getStackTrace()){ - Waila.log.log(Level.WARN, String.format("%s.%s:%s",elem.getClassName(), elem.getMethodName(), elem.getLineNumber())); - if (elem.getClassName().contains("waila")) break; - } - - Waila.log.log(Level.WARN, String.format("Catched unhandled exception : [%s] %s",className,e)); - } - if (currenttip != null) - currenttip.add(""); - - return currenttip; - } + public WailaExceptionHandler() {} + + private static ArrayList errs = new ArrayList(); + + public static List handleErr(Throwable e, String className, List currenttip) { + if (!errs.contains(className)) { + errs.add(className); + + for (StackTraceElement elem : e.getStackTrace()) { + Waila.log.log( + Level.WARN, + String.format("%s.%s:%s", elem.getClassName(), elem.getMethodName(), elem.getLineNumber())); + if (elem.getClassName().contains("waila")) break; + } + + Waila.log.log(Level.WARN, String.format("Catched unhandled exception : [%s] %s", className, e)); + } + if (currenttip != null) currenttip.add(""); + + return currenttip; + } }