mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 04:22:26 +00:00
Tooltip auto-scaling! All tooltips now have equal widths, even in different languages.
This commit is contained in:
1 parent
22bf688fbd
commit
f19a8f9e64
13 files changed
+235
-119
No files matched your search
@@ -170,6 +170,7 @@ import mekanism.common.tile.TileEntitySolarNeutronActivator;
|
||||
import mekanism.common.tile.TileEntityStructuralGlass;
|
||||
import mekanism.common.tile.TileEntityTeleporter;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.renderer.entity.RenderSkeleton;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -639,4 +640,10 @@ public class ClientProxy extends CommonProxy
|
||||
{
|
||||
Minecraft.getMinecraft().effectRenderer.addEffect(new EntityLaser(world, from, to, direction, energy));
|
||||
}
|
||||
|
||||
@Override
|
||||
public FontRenderer getFontRenderer()
|
||||
{
|
||||
return Minecraft.getMinecraft().fontRenderer;
|
||||
}
|
||||
}
|
||||
@@ -17,11 +17,12 @@ import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiUpgradeManagement extends GuiMekanism
|
||||
{
|
||||
@@ -125,7 +126,7 @@ public class GuiUpgradeManagement extends GuiMekanism
|
||||
|
||||
if(xAxis >= xPos && xAxis <= xPos+58 && yAxis >= yPos && yAxis <= yPos+12)
|
||||
{
|
||||
func_146283_a(MekanismUtils.splitLines(upgrade.getDescription()), xAxis, yAxis);
|
||||
func_146283_a(MekanismUtils.splitTooltip(upgrade.getDescription(), upgrade.getStack()), xAxis, yAxis);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -663,4 +663,9 @@ public class CommonProxy implements IGuiProvider
|
||||
}
|
||||
|
||||
public void renderLaser(World world, Pos3D from, Pos3D to, ForgeDirection direction, double energy) {}
|
||||
|
||||
public Object getFontRenderer()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -306,7 +306,7 @@ public class Mekanism
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade), new Object[] {
|
||||
" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustTin"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade), new Object[] {
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.MufflingUpgrade), new Object[] {
|
||||
" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustSteel"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), new Object[] {
|
||||
|
||||
@@ -1,15 +1,13 @@
|
||||
package mekanism.common.item;
|
||||
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.Optional.Interface;
|
||||
import cpw.mods.fml.common.Optional.InterfaceList;
|
||||
import cpw.mods.fml.common.Optional.Method;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import ic2.api.item.IElectricItemManager;
|
||||
import ic2.api.item.ISpecialElectricItem;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
@@ -20,14 +18,25 @@ import mekanism.client.MekanismKeyHandler;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Upgrade;
|
||||
import mekanism.common.base.*;
|
||||
import mekanism.common.base.IElectricChest;
|
||||
import mekanism.common.base.IFactory;
|
||||
import mekanism.common.base.IRedstoneControl;
|
||||
import mekanism.common.base.IRedstoneControl.RedstoneControl;
|
||||
import mekanism.common.base.ISideConfiguration;
|
||||
import mekanism.common.base.ISustainedData;
|
||||
import mekanism.common.base.ISustainedInventory;
|
||||
import mekanism.common.base.ISustainedTank;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.integration.IC2ItemManager;
|
||||
import mekanism.common.inventory.InventoryElectricChest;
|
||||
import mekanism.common.network.PacketElectricChest.ElectricChestMessage;
|
||||
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
|
||||
import mekanism.common.tile.*;
|
||||
import mekanism.common.tile.TileEntityBasicBlock;
|
||||
import mekanism.common.tile.TileEntityElectricBlock;
|
||||
import mekanism.common.tile.TileEntityElectricChest;
|
||||
import mekanism.common.tile.TileEntityFactory;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -52,9 +61,12 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.Optional.Interface;
|
||||
import cpw.mods.fml.common.Optional.InterfaceList;
|
||||
import cpw.mods.fml.common.Optional.Method;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
/**
|
||||
* Item class for handling multiple machine block IDs.
|
||||
@@ -221,7 +233,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
}
|
||||
}
|
||||
else {
|
||||
list.addAll(MekanismUtils.splitLines(type.getDescription()));
|
||||
list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ public class ItemBlockOre extends ItemBlock
|
||||
list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + LangUtils.localize("tooltip.forDetails") + ".");
|
||||
}
|
||||
else {
|
||||
list.addAll(MekanismUtils.splitLines(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", ""))));
|
||||
list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")), itemstack));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ public class ItemUpgrade extends ItemMekanism implements IUpgradeItem
|
||||
list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails"));
|
||||
}
|
||||
else {
|
||||
list.addAll(MekanismUtils.splitLines(getUpgradeType(itemstack).getDescription()));
|
||||
list.addAll(MekanismUtils.splitTooltip(getUpgradeType(itemstack).getDescription(), itemstack));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,20 @@
|
||||
package mekanism.common.util;
|
||||
|
||||
import buildcraft.api.tools.IToolWrench;
|
||||
import cofh.api.item.IToolHammer;
|
||||
import cpw.mods.fml.common.ModContainer;
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
import ic2.api.energy.EnergyNet;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import mekanism.api.Chunk3D;
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.EnumColor;
|
||||
@@ -17,10 +27,24 @@ import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.api.util.UnitDisplayUtils;
|
||||
import mekanism.api.util.UnitDisplayUtils.ElectricUnit;
|
||||
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
|
||||
import mekanism.common.*;
|
||||
import mekanism.common.Tier.*;
|
||||
import mekanism.common.base.*;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.MekanismItems;
|
||||
import mekanism.common.OreDictCache;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.EnergyCubeTier;
|
||||
import mekanism.common.Tier.FactoryTier;
|
||||
import mekanism.common.Tier.InductionCellTier;
|
||||
import mekanism.common.Tier.InductionProviderTier;
|
||||
import mekanism.common.Upgrade;
|
||||
import mekanism.common.Version;
|
||||
import mekanism.common.base.IActiveState;
|
||||
import mekanism.common.base.IFactory;
|
||||
import mekanism.common.base.IFactory.RecipeType;
|
||||
import mekanism.common.base.IModule;
|
||||
import mekanism.common.base.IRedstoneControl;
|
||||
import mekanism.common.base.ISideConfiguration;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.inventory.container.ContainerElectricChest;
|
||||
import mekanism.common.item.ItemBlockBasic;
|
||||
import mekanism.common.item.ItemBlockEnergyCube;
|
||||
@@ -31,6 +55,7 @@ import mekanism.common.tile.TileEntityAdvancedBoundingBlock;
|
||||
import mekanism.common.tile.TileEntityBoundingBlock;
|
||||
import mekanism.common.tile.TileEntityElectricChest;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -49,18 +74,19 @@ import net.minecraft.world.EnumSkyBlock;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidBlock;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.*;
|
||||
import buildcraft.api.tools.IToolWrench;
|
||||
import cofh.api.item.IToolHammer;
|
||||
import cpw.mods.fml.common.ModContainer;
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
/**
|
||||
* Utilities used by Mekanism. All miscellaneous methods are located here.
|
||||
@@ -1233,20 +1259,76 @@ public final class MekanismUtils
|
||||
{
|
||||
return "[" + obj.xCoord + ", " + obj.yCoord + ", " + obj.zCoord + "]";
|
||||
}
|
||||
|
||||
/**
|
||||
* Splits a string of text into a list of new segments, using the splitter "!n."
|
||||
* @param s - string to split
|
||||
* @return split string
|
||||
*/
|
||||
public static List<String> splitLines(String s)
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static List<String> splitTooltip(String s, ItemStack stack)
|
||||
{
|
||||
ArrayList ret = new ArrayList();
|
||||
|
||||
String[] split = s.split("!n");
|
||||
ret.addAll(Arrays.asList(split));
|
||||
|
||||
return ret;
|
||||
s = s.trim();
|
||||
|
||||
try {
|
||||
FontRenderer renderer = (FontRenderer)Mekanism.proxy.getFontRenderer();
|
||||
|
||||
if(stack != null && stack.getItem().getFontRenderer(stack) != null)
|
||||
{
|
||||
renderer = stack.getItem().getFontRenderer(stack);
|
||||
}
|
||||
|
||||
List<String> words = new ArrayList<String>();
|
||||
List<String> lines = new ArrayList<String>();
|
||||
|
||||
String currentWord = "";
|
||||
|
||||
for(Character c : s.toCharArray())
|
||||
{
|
||||
if(c.equals(' '))
|
||||
{
|
||||
words.add(currentWord);
|
||||
currentWord = "";
|
||||
}
|
||||
else {
|
||||
currentWord += c;
|
||||
}
|
||||
}
|
||||
|
||||
if(!currentWord.isEmpty())
|
||||
{
|
||||
words.add(currentWord);
|
||||
}
|
||||
|
||||
String currentLine = "";
|
||||
|
||||
for(String word : words)
|
||||
{
|
||||
if(currentLine.isEmpty() || renderer.getStringWidth(currentLine + " " + word) <= 200)
|
||||
{
|
||||
if(currentLine.length() > 0)
|
||||
{
|
||||
currentLine += " ";
|
||||
}
|
||||
|
||||
currentLine += word;
|
||||
|
||||
continue;
|
||||
}
|
||||
else {
|
||||
lines.add(currentLine);
|
||||
currentLine = word;
|
||||
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if(!currentLine.isEmpty())
|
||||
{
|
||||
lines.add(currentLine);
|
||||
}
|
||||
|
||||
return lines;
|
||||
} catch(Throwable t) {
|
||||
t.printStackTrace();
|
||||
}
|
||||
|
||||
return new ArrayList<String>();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -56,10 +56,13 @@ public class GuiReactorLogicAdapter extends GuiMekanism
|
||||
GL11.glPopMatrix();
|
||||
|
||||
fontRendererObj.drawString(EnumColor.WHITE + type.getLocalizedName(), 46, 34+(22*type.ordinal()), 0x404040);
|
||||
|
||||
}
|
||||
|
||||
for(ReactorLogic type : ReactorLogic.values())
|
||||
{
|
||||
if(xAxis >= 24 && xAxis <= 152 && yAxis >= 32+(22*type.ordinal()) && yAxis <= 32+22+(22*type.ordinal()))
|
||||
{
|
||||
drawCreativeTabHoveringText(type.getDescription(), xAxis, yAxis);
|
||||
displayTooltips(MekanismUtils.splitTooltip(type.getDescription(), null), xAxis, yAxis);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -137,11 +137,17 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
|
||||
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0));
|
||||
}
|
||||
else {
|
||||
list.addAll(MekanismUtils.splitLines(type.getDescription()));
|
||||
list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack));
|
||||
}
|
||||
}
|
||||
else {
|
||||
list.addAll(MekanismUtils.splitLines(type.getDescription()));
|
||||
if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey))
|
||||
{
|
||||
list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + ".");
|
||||
}
|
||||
else {
|
||||
list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,11 +11,12 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemBlockReactor extends ItemBlock
|
||||
{
|
||||
public Block metaBlock;
|
||||
@@ -56,7 +57,7 @@ public class ItemBlockReactor extends ItemBlock
|
||||
list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + ".");
|
||||
}
|
||||
else {
|
||||
list.addAll(MekanismUtils.splitLines(type.getDescription()));
|
||||
list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack));
|
||||
}
|
||||
}
|
||||
}
|
||||
+4
-3
@@ -1,14 +1,15 @@
|
||||
package mekanism.generators.common.tile.reactor;
|
||||
|
||||
import dan200.computercraft.api.lua.LuaException;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mekanism.common.integration.IComputerIntegration;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import dan200.computercraft.api.lua.LuaException;
|
||||
|
||||
public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implements IComputerIntegration
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user