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

Even more localization, fixed a few tiny bugs

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-14 15:13:12 -05:00
parent acdbf1f3cb
commit 1e1eabfd5e
10 changed files with 48 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/mekanism/client/gui/GuiDigitalMiner.java
View file

@ -147,9 +147,9 @@ public class GuiDigitalMiner extends GuiMekanism
fontRenderer.drawString(tileEntity.running ? MekanismUtils.localize("gui.digitalMiner.running") : MekanismUtils.localize("gui.digitalMiner.idle"), 9, 10, 0x00CD00);
fontRenderer.drawString(tileEntity.searcher.state.desc, 9, 19, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.eject") + ": " + (tileEntity.doEject ? "On" : "Off"), 9, 30, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.pull") + ": " + (tileEntity.doPull ? "On" : "Off"), 9, 39, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.silk") + ": " + (tileEntity.silkTouch ? "On" : "Off"), 9, 48, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.eject") + ": " + MekanismUtils.localize("gui." + (tileEntity.doEject ? "on" : "off")), 9, 30, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.pull") + ": " + MekanismUtils.localize("gui." + (tileEntity.doPull ? "on" : "off")), 9, 39, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.silk") + ": " + MekanismUtils.localize("gui." + (tileEntity.silkTouch ? "on" : "off")), 9, 48, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.toMine") + ":", 9, 59, 0x00CD00);
fontRenderer.drawString("" + tileEntity.clientToMine, 9, 68, 0x00CD00);

10
common/mekanism/client/gui/GuiDigitalMinerConfig.java
View file

@ -241,8 +241,8 @@ public class GuiDigitalMinerConfig extends GuiMekanism
int guiHeight = (height - ySize) / 2;
buttonList.clear();
buttonList.add(new GuiButton(0, guiWidth + 56, guiHeight + 136, 54, 20, "ItemStack"));
buttonList.add(new GuiButton(1, guiWidth + 110, guiHeight + 136, 43, 20, "OreDict"));
buttonList.add(new GuiButton(0, guiWidth + 56, guiHeight + 136, 54, 20, MekanismUtils.localize("gui.itemstack")));
buttonList.add(new GuiButton(1, guiWidth + 110, guiHeight + 136, 43, 20, MekanismUtils.localize("gui.oredict")));
String prevRad = radiusField != null ? radiusField.getText() : "";
String prevMin = minField != null ? minField.getText() : "";
@ -284,7 +284,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism
fontRenderer.drawString(MekanismUtils.localize("gui.digitalMinerConfig"), 43, 6, 0x404040);
fontRenderer.drawString("Filters:", 11, 19, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00);
fontRenderer.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00);
fontRenderer.drawString("IS: " + getItemStackFilters().size(), 11, 37, 0x00CD00);
fontRenderer.drawString("OD: " + getOreDictFilters().size(), 11, 46, 0x00CD00);
@ -315,7 +315,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism
GL11.glPopMatrix();
}
fontRenderer.drawString("Item Filter", 78, yStart + 2, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040);
}
else if(filter instanceof MOreDictFilter)
{
@ -335,7 +335,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism
GL11.glPopMatrix();
}
fontRenderer.drawString("OreDict Filter", 78, yStart + 2, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040);
}
}
}

8
common/mekanism/client/gui/GuiLogisticalSorter.java
View file

@ -270,16 +270,16 @@ public class GuiLogisticalSorter extends GuiMekanism
fontRenderer.drawString(tileEntity.getInvName(), 43, 6, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("gui.logisticalSorter.filters") + ":", 11, 19, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00);
fontRenderer.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00);
fontRenderer.drawString("IS: " + getItemStackFilters().size(), 11, 37, 0x00CD00);
fontRenderer.drawString("OD: " + getOreDictFilters().size(), 11, 46, 0x00CD00);
fontRenderer.drawString("RR:", 12, 74, 0x00CD00);
fontRenderer.drawString(tileEntity.roundRobin ? "On" : "Off", 27, 86, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui." + (tileEntity.roundRobin ? "on" : "off")), 27, 86, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.logisticalSorter.auto") + ":", 12, 100, 0x00CD00);
fontRenderer.drawString(tileEntity.autoEject ? "On" : "Off", 27, 112, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui." + (tileEntity.autoEject ? "on" : "off")), 27, 112, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.logisticalSorter.default") + ":", 12, 126, 0x00CD00);
@ -324,7 +324,7 @@ public class GuiLogisticalSorter extends GuiMekanism
GL11.glPopMatrix();
}
fontRenderer.drawString("OreDict Filter", 78, yStart + 2, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040);
fontRenderer.drawString(filter.color != null ? filter.color.getName() : MekanismUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
}
}

18
common/mekanism/client/gui/GuiMItemStackFilter.java
View file

@ -32,7 +32,7 @@ public class GuiMItemStackFilter extends GuiMekanism
public MItemStackFilter filter = new MItemStackFilter();
public String status = EnumColor.DARK_GREEN + "All OK";
public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK");
public int ticker;
@ -62,8 +62,8 @@ public class GuiMItemStackFilter extends GuiMekanism
int guiHeight = (height - ySize) / 2;
buttonList.clear();
buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, "Save"));
buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, "Delete"));
buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save")));
buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete")));
if(isNew)
{
@ -92,7 +92,7 @@ public class GuiMItemStackFilter extends GuiMekanism
}
else if(filter.itemType == null)
{
status = EnumColor.DARK_RED + "No item";
status = EnumColor.DARK_RED + MekanismUtils.localize("gui.itemFilter.noItem");
ticker = 20;
}
}
@ -109,13 +109,13 @@ public class GuiMItemStackFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
fontRenderer.drawString((isNew ? "New" : "Edit") + " Item Filter", 43, 6, 0x404040);
fontRenderer.drawString("Status: " + status, 35, 20, 0x00CD00);
fontRenderer.drawString("ItemStack Details:", 35, 32, 0x00CD00);
fontRenderer.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.itemFilter"), 43, 6, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
fontRenderer.drawString(MekanismUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00);
if(filter.itemType != null)
{
fontRenderer.drawString("Item: " + filter.itemType.getDisplayName(), 35, 41, 0x00CD00);
fontRenderer.drawString(filter.itemType.getDisplayName(), 35, 41, 0x00CD00);
}
if(filter.itemType != null)
@ -140,7 +140,7 @@ public class GuiMItemStackFilter extends GuiMekanism
ticker--;
}
else {
status = EnumColor.DARK_GREEN + "All OK";
status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK");
}
}

4
common/mekanism/client/gui/GuiTItemStackFilter.java
View file

@ -34,7 +34,7 @@ public class GuiTItemStackFilter extends GuiMekanism
public TItemStackFilter filter = new TItemStackFilter();
public String status = EnumColor.DARK_GREEN + "All OK";
public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK");
public int ticker;
@ -167,7 +167,7 @@ public class GuiTItemStackFilter extends GuiMekanism
fontRenderer.drawString(MekanismUtils.localize("gui.itemFilter.min") + ":", 128, 20, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("gui.itemFilter.max") + ":", 128, 32, 0x404040);
fontRenderer.drawString(filter.sizeMode ? "On" : "Off", 141, 46, 0x404040);
fontRenderer.drawString(MekanismUtils.localize("gui." + (filter.sizeMode ? "on" : "off")), 141, 46, 0x404040);
if(filter.itemType != null)
{

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

@ -160,7 +160,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem
}
}
else {
list.addAll(MekanismUtils.getSplitText(type.getDescription()));
list.addAll(MekanismUtils.splitLines(type.getDescription()));
}
}

32
common/mekanism/common/item/ItemBlockOre.java
View file

@ -2,17 +2,19 @@ package mekanism.common.item;
import java.util.List;
import org.lwjgl.input.Keyboard;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.EnumColor;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import org.lwjgl.input.Keyboard;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Item class for handling multiple ore block IDs.
* 0: Osmium Ore
@ -41,27 +43,7 @@ public class ItemBlockOre extends ItemBlock
list.add("Hold " + EnumColor.AQUA + "shift" + EnumColor.GREY + " for details.");
}
else {
if(itemstack.getItemDamage() == 0)
{
list.add("A strong mineral that can be found");
list.add("at nearly any height in the world.");
list.add("It is known to have many uses in");
list.add("the construction of machinery.");
}
else if(itemstack.getItemDamage() == 1)
{
list.add("A common, conductive material that");
list.add("can be used in the production of.");
list.add("wires. It's ability to withstand");
list.add("high heats also makes it essential");
list.add("to advanced machinery.");
}
else if(itemstack.getItemDamage() == 2)
{
list.add("A lightweight, yet sturdy, conductive");
list.add("material that is found slighly less");
list.add("commonly than Copper.");
}
list.addAll(MekanismUtils.splitLines(MekanismUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", ""))));
}
}

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

@ -47,14 +47,22 @@ public class ItemNetworkReader extends ItemEnergized
{
String[] strings = TransmitterNetworkRegistry.getInstance().toStrings();
player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanism Debug]" + EnumColor.GREY + " ----------"));
for(String s : strings)
{
player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_GREY + s));
}
player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
}
}
return false;
}
@Override
public boolean canSend(ItemStack itemstack)
{
return false;
}
}

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

@ -1128,7 +1128,7 @@ public final class MekanismUtils
return "[" + obj.xCoord + ", " + obj.yCoord + ", " + obj.zCoord + "]";
}
public static List<String> getSplitText(String s)
public static List<String> splitLines(String s)
{
ArrayList ret = new ArrayList();

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

@ -172,6 +172,9 @@ gui.eject=Eject
gui.input=Input
gui.slots=Slots
gui.state=State
gui.on=On
gui.off=Off
gui.filters=Filters
gui.dictionary.noKey=No key.
gui.dictionary.key=Key
@ -195,6 +198,7 @@ gui.oredictFilter.noKey=No key entered
gui.oredictFilter.sameKey=Same key
gui.itemFilter=Item Filter
gui.itemFilter.noItem=No item
gui.itemFilter.details=ItemStack Details
gui.itemFilter.min=Min
gui.itemFilter.max=Max
@ -225,7 +229,6 @@ gui.password.identical=Identical
gui.password.invalid=Invalid
gui.password=Password
gui.logisticalSorter.filters=Filters
gui.logisticalSorter.default=Default
gui.logisticalSorter.auto=Auto
gui.logisticalSorter.roundRobin=Round robin
@ -280,6 +283,10 @@ tooltip.Chargepad=A universal chargepad that can charge any energized item !nfro
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.
tooltip.OsmiumOre=A strong mineral that can be found !nat nearly any height in the world. !nIt is known to have many uses in !nthe construction of machinery.
tooltip.CopperOre=A common, conductive material that !ncan be used in the production of !nwires. It's ability to withstand !nhigh heats also makes it essential !nto advanced machinery.
tooltip.TinOre=A lightweight, yet sturdy, conductive !nmaterial that is found slightly less !ncommonly than Copper.
//Redstone control
control.disabled=Disabled
control.high=High