diff --git a/src/main/java/com/enderio/core/api/client/gui/IAdvancedTooltipProvider.java b/src/main/java/com/enderio/core/api/client/gui/IAdvancedTooltipProvider.java index 8d2745a..febfda2 100644 --- a/src/main/java/com/enderio/core/api/client/gui/IAdvancedTooltipProvider.java +++ b/src/main/java/com/enderio/core/api/client/gui/IAdvancedTooltipProvider.java @@ -2,16 +2,20 @@ package com.enderio.core.api.client.gui; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public interface IAdvancedTooltipProvider { - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); - - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); } diff --git a/src/main/java/com/enderio/core/client/gui/button/IconButton.java b/src/main/java/com/enderio/core/client/gui/button/IconButton.java index 2c7ff20..79181e6 100644 --- a/src/main/java/com/enderio/core/client/gui/button/IconButton.java +++ b/src/main/java/com/enderio/core/client/gui/button/IconButton.java @@ -150,9 +150,6 @@ public class IconButton extends GuiButton { GL11.glColor3f(1, 1, 1); - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - int x = xPosition; int y = yPosition; @@ -160,13 +157,11 @@ public class IconButton extends GuiButton { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - background.getMap().render(background, x, y, width, height, 0, false); + background.getMap().render(background, x, y, width, height, 0, true); if (icon != null) { - icon.getMap().render(icon, x + marginX, y + marginY, width - (2 * marginX), height - (2 * marginY), 0, false); + icon.getMap().render(icon, x + marginX, y + marginY, width - (2 * marginX), height - (2 * marginY), 0, true); } - tes.draw(); - GL11.glPopAttrib(); } diff --git a/src/main/java/com/enderio/core/client/handlers/SpecialTooltipHandler.java b/src/main/java/com/enderio/core/client/handlers/SpecialTooltipHandler.java new file mode 100644 index 0000000..a9a8224 --- /dev/null +++ b/src/main/java/com/enderio/core/client/handlers/SpecialTooltipHandler.java @@ -0,0 +1,207 @@ +package com.enderio.core.client.handlers; + +import java.util.ArrayList; +import java.util.List; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemTool; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; + +import org.lwjgl.input.Keyboard; + +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.Handlers.Handler; +import com.enderio.core.common.Handlers.Handler.HandlerType; +import com.enderio.core.common.config.ConfigHandler; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; +import com.google.common.collect.Lists; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +import static com.enderio.core.common.config.ConfigHandler.showOredictTooltips; + +@Handler(HandlerType.FORGE) +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class SpecialTooltipHandler { + + public interface ITooltipCallback extends IAdvancedTooltipProvider { + boolean shouldHandleItem(ItemStack item); + } + + public static final SpecialTooltipHandler INSTANCE = new SpecialTooltipHandler(); + + private final List callbacks = Lists.newArrayList(); + + public void addCallback(ITooltipCallback callback) { + callbacks.add(callback); + } + + @SubscribeEvent + public void addTooltip(ItemTooltipEvent evt) { + if(evt.itemStack == null) { + return; + } + + boolean shiftDown = showAdvancedTooltips(); + boolean debugMode = Minecraft.getMinecraft().gameSettings.advancedItemTooltips; + boolean doDurability = ConfigHandler.showDurabilityTooltips == 3 ? debugMode : showOredictTooltips == 2 ? shiftDown : showOredictTooltips == 1; + + if (doDurability) { + addDurabilityTooltip(evt.toolTip, evt.itemStack); + } + + if(evt.itemStack.getItem() instanceof IAdvancedTooltipProvider) { + IAdvancedTooltipProvider ttp = (IAdvancedTooltipProvider) evt.itemStack.getItem(); + addInformation(ttp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); + return; + } else if(evt.itemStack.getItem() instanceof IResourceTooltipProvider) { + addInformation((IResourceTooltipProvider) evt.itemStack.getItem(), evt); + return; + } + + Block blk = Block.getBlockFromItem(evt.itemStack.getItem()); + if(blk instanceof IAdvancedTooltipProvider) { + addInformation((IAdvancedTooltipProvider) blk, evt.itemStack, evt.entityPlayer, evt.toolTip, false); + return; + } else if(blk instanceof IResourceTooltipProvider) { + addInformation((IResourceTooltipProvider) blk, evt); + return; + } + + for (ITooltipCallback callback : callbacks) { + if (callback.shouldHandleItem(evt.itemStack)) { + addInformation(callback, evt.itemStack, evt.entityPlayer, evt.toolTip, false); + } + } + } + + public void addDurabilityTooltip(List toolTip, ItemStack itemStack) { + if(!itemStack.isItemStackDamageable()) { + return; + } + Item item = itemStack.getItem(); + if(item instanceof ItemTool || item instanceof ItemArmor || + item instanceof ItemSword || item instanceof ItemHoe || item instanceof ItemBow) { + toolTip.add(ItemUtil.getDurabilityString(itemStack)); + } + } + + public void addInformation(IResourceTooltipProvider item, ItemTooltipEvent evt) { + addInformation(item, evt.itemStack, evt.entityPlayer, evt.toolTip); + } + + public void addInformation(IResourceTooltipProvider tt, ItemStack itemstack, EntityPlayer entityplayer, List list) { + String name = tt.getUnlocalizedNameForTooltip(itemstack); + if(showAdvancedTooltips()) { + addCommonTooltipFromResources(list, name); + addDetailedTooltipFromResources(list, name); + } else { + addBasicTooltipFromResources(list, name); + addCommonTooltipFromResources(list, name); + if(hasDetailedTooltip(tt, itemstack)) { + addShowDetailsTooltip(list); + } + } + } + + public void addInformation(IAdvancedTooltipProvider tt, ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + tt.addCommonEntries(itemstack, entityplayer, list, flag); + if(showAdvancedTooltips()) { + tt.addDetailedEntries(itemstack, entityplayer, list, flag); + } else { + tt.addBasicEntries(itemstack, entityplayer, list, flag); + if(hasDetailedTooltip(tt, itemstack, entityplayer, flag)) { + addShowDetailsTooltip(list); + } + } + } + + private static final List throwaway = new ArrayList(); + + private static boolean hasDetailedTooltip(IResourceTooltipProvider tt, ItemStack stack) { + throwaway.clear(); + String name = tt.getUnlocalizedNameForTooltip(stack); + addDetailedTooltipFromResources(throwaway, name); + return !throwaway.isEmpty(); + } + + private static boolean hasDetailedTooltip(IAdvancedTooltipProvider tt, ItemStack stack, EntityPlayer player, boolean flag) { + throwaway.clear(); + tt.addDetailedEntries(stack, player, throwaway, flag); + return !throwaway.isEmpty(); + } + + public static void addShowDetailsTooltip(List list) { + list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); + } + + public static boolean showAdvancedTooltips() { + return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); + } + + public static void addDetailedTooltipFromResources(List list, String unlocalizedName) { + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.detailed.line")); + } + + public static void addBasicTooltipFromResources(List list, String unlocalizedName) { + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.basic.line")); + } + + public static void addCommonTooltipFromResources(List list, String unlocalizedName) { + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.common.line")); + } + + public static void addTooltipFromResources(List list, String keyBase) { + boolean done = false; + int line = 1; + while (!done) { + String key = keyBase + line; + String val = Lang.localize(key, false); + if(val == null || val.trim().length() < 0 || val.equals(key) || line > 12) { + done = true; + } else { + list.add(val); + line++; + } + } + } + + private static String getUnlocalizedNameForTooltip(ItemStack itemstack) { + String unlocalizedNameForTooltip = null; + if (itemstack.getItem() instanceof IResourceTooltipProvider) { + unlocalizedNameForTooltip = ((IResourceTooltipProvider)itemstack.getItem()).getUnlocalizedNameForTooltip(itemstack); + } + if(unlocalizedNameForTooltip == null) { + unlocalizedNameForTooltip = itemstack.getItem().getUnlocalizedName(itemstack); + } + return unlocalizedNameForTooltip; + } + + public static void addCommonTooltipFromResources(List list, ItemStack itemstack) { + if(itemstack.getItem() == null) { + return; + } + addCommonTooltipFromResources(list, getUnlocalizedNameForTooltip(itemstack)); + } + + public static void addDetailedTooltipFromResources(List list, ItemStack itemstack) { + if(itemstack.getItem() == null) { + return; + } + addDetailedTooltipFromResources(list, getUnlocalizedNameForTooltip(itemstack)); + } + +} diff --git a/src/main/java/com/enderio/core/client/render/TechneUtil.java b/src/main/java/com/enderio/core/client/render/TechneUtil.java index 1a8bf25..d3fb826 100644 --- a/src/main/java/com/enderio/core/client/render/TechneUtil.java +++ b/src/main/java/com/enderio/core/client/render/TechneUtil.java @@ -329,6 +329,9 @@ public class TechneUtil { } public static void renderInventoryBlock(Collection model, IIcon icon, Block block, int metadata, RenderBlocks rb) { + if (icon == null) { + return; + } tes.startDrawingQuads(); tes.setColorOpaque_F(1, 1, 1); tes.addTranslation(0, -0.47f, 0); @@ -344,6 +347,9 @@ public class TechneUtil { } public static boolean renderWorldBlock(Collection model, IIcon icon, IBlockAccess world, int x, int y, int z, Block block, RenderBlocks rb) { + if (icon == null) { + return false; + } tes.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tes.setColorOpaque_F(1, 1, 1); tes.addTranslation(x + .5F, y + 0.0375f, z + .5F); diff --git a/src/main/java/com/enderio/core/common/config/ConfigHandler.java b/src/main/java/com/enderio/core/common/config/ConfigHandler.java index 4decf75..1761093 100644 --- a/src/main/java/com/enderio/core/common/config/ConfigHandler.java +++ b/src/main/java/com/enderio/core/common/config/ConfigHandler.java @@ -37,6 +37,12 @@ public class ConfigHandler extends AbstractConfigHandler implements ITweakConfig @Range(min = 0, max = 3) @NoSync public static int showRegistryNameTooltips = 3; + + @Config + @Comment({ "Show durability on item tooltips.", "0 - Off", "1 - Always on", "2 - Only with shift", "3 - Only in debug mode" }) + @Range(min = 0, max = 3) + @NoSync + public static int showDurabilityTooltips = 1; @Config @Comment({ "Removes all void fog.", "0 = off", "1 = DEFAULT worldtype only", "2 = all world types" })