tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Added description text to machines

Browse source
This commit is contained in:
Aidan Brady 2013-12-06 20:03:25 -05:00
parent 84ab705170
commit 916859c21d
4 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/mekanism/common/block/BlockMachine.java
View file

@ -1074,6 +1074,11 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
}
}
public String getDescription()
{
return MekanismUtils.localize("tooltip." + name);
}
public ItemStack getStack()
{
return new ItemStack(typeId, 1, meta);

8
common/mekanism/common/item/ItemBlockMachine.java
View file

@ -120,10 +120,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem
if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))
{
list.add("Hold " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " for a description.");
list.add("Hold " + EnumColor.AQUA + "shift-M" + EnumColor.GREY + " for more details.");
list.add("Hold " + EnumColor.AQUA + EnumColor.INDIGO + "shift" + EnumColor.GREY + " for more details.");
list.add("Hold " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + "M" + EnumColor.GREY + " for a description.");
}
else if(Keyboard.isKeyDown(Keyboard.KEY_M))
else if(!Keyboard.isKeyDown(Keyboard.KEY_M))
{
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
{
@ -169,7 +169,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem
}
}
else {
list.addAll(MekanismUtils.getSplitText(type.getDescription()));
}
}

14
common/mekanism/common/util/MekanismUtils.java
View file

@ -8,17 +8,19 @@ import java.lang.reflect.Method;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import mekanism.api.EnumColor;
import mekanism.api.Object3D;
import mekanism.common.DynamicTankCache;
import mekanism.common.IActiveState;
import mekanism.common.IInvConfiguration;
import mekanism.common.IFactory;
import mekanism.common.IFactory.RecipeType;
import mekanism.common.IInvConfiguration;
import mekanism.common.IModule;
import mekanism.common.IRedstoneControl;
import mekanism.common.IRedstoneControl.RedstoneControl;
@ -1126,6 +1128,16 @@ public final class MekanismUtils
return "[" + obj.xCoord + ", " + obj.yCoord + ", " + obj.zCoord + "]";
}
public static List<String> getSplitText(String s)
{
ArrayList ret = new ArrayList();
String[] split = s.split("!n");
ret.addAll(Arrays.asList(split));
return ret;
}
public static enum ResourceType
{
GUI("gui"),

18
resources/assets/mekanism/lang/en_US.lang
View file

@ -249,6 +249,24 @@ tooltip.jetpack.regular=Regular
tooltip.jetpack.hover=Hover
tooltip.jetpack.disabled=Disabled
tooltip.EnrichmentChamber=A simple machine used to enrich ores into !ntwo of their dust counterparts, as well as !nperform many other operations.
tooltip.OsmiumCompressor=A fairly advanced machine used to compress !nosmium into various dusts in order to create !ntheir ingot counterparts.
tooltip.Combiner=A machine used to combine dusts and cobblestone to !nform their ore counterparts.
tooltip.Crusher=A machine used to crush ingots into their dust counterparts, !nas well as perform many other operations.
tooltip.DigitalMiner=A highly-advanced, filter-based, auto-miner that can !nmine whatever block you tell it to within !na 32 block (max) radius.
tooltip.BasicFactory=The lowest tier of the line of Factories, which can !nbe used to process multiple machine operations !nat once.
tooltip.AdvancedFactory=The middle tier of the line of Factories, which can !nbe used to process multiple machine !noperations at once.
tooltip.EliteFactory=The highest tier of the line of Factories, which can !nbe used to process multiple machine !noperations at once.
tooltip.MetallurgicInfuser=A machine used to infuse various materials !ninto (generally) metals to create metal alloys !nand other compounds.
tooltip.PurificationChamber=An advanced machine capable of processing !nores into three clumps, serving as the initial !nstage of 300% ore processing.
tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based !nfurnace that runs off of energy.
tooltip.Teleporter=A machine capable of teleporting players to various !nlocations defined by another teleported.
tooltip.ElectricPump=An advanced pump capable of pumping out an entire !nlava lake.
tooltip.ElectricChest=A portable, 54-slot chest that uses energy to lock !nitself from others by means of password protection.
tooltip.Chargepad=A universal chargepad that can charge any energized item !nfrom any mod.
tooltip.LogisticalSorter=A filter-based, advanced sorting machine that !ncan auto-eject specified items out of and into !nadjacent inventories and Logistical Transporters.
tooltip.RotaryCondensentrator=A machine capable of converting gasses into !ntheir fluid form and vice versa.
//Redstone control
control.disabled=Disabled
control.high=High