reworked textures and langs a bit

This commit is contained in:
Robert 2013-12-12 14:01:35 -05:00
parent 7a52323403
commit 561e52ed46
52 changed files with 26 additions and 22 deletions

View file

@ -4,11 +4,13 @@ itemGroup.Automation = Automation
itemGroup.Industrial = Industrial itemGroup.Industrial = Industrial
itemGroup.Hydraulic = Hydraulics itemGroup.Hydraulic = Hydraulics
# Note if you are translating you do not have to use the content in the '[]' as its mainly for devs to use
# Tiles and Blocks # Tiles and Blocks
tile.DebugBlock.0.name = Unlimited Power tile.DebugBlock.0.name = [Creative]Unlimited Power
tile.DebugBlock.1.name = Unlimited Fluid tile.DebugBlock.1.name = [Creative]Unlimited Fluid
tile.DebugBlock.2.name = Fluid Void tile.DebugBlock.2.name = [Creative]Fluid Void
tile.DebugBlock.3.name = Power Void tile.DebugBlock.3.name = [Creative]Power Void
tile.colorSand.Black.name = Black Sand tile.colorSand.Black.name = Black Sand
tile.colorSand.Red.name = Red Sand tile.colorSand.Red.name = Red Sand
@ -68,10 +70,10 @@ tile.basaltchiseled.name = Chiseled Basalt Bricks
tile.basaltmossy.name = Mossy Basalt Bricks tile.basaltmossy.name = Mossy Basalt Bricks
tile.basaltcracked.name = Cracked Basalt Bricks tile.basaltcracked.name = Cracked Basalt Bricks
tile.BlockSolarPanel.0.name = Solar Panel tile.BlockSolarPanel.0.name = [WIP]Solar Panel
tile.DMEnergyStorage.0.name = Battery Box tile.DMEnergyStorage.0.name = Battery Box
tile.DMEnergyStorage.1.name = Capacitor Box tile.DMEnergyStorage.1.name = [WIP]Capacitor Box
tile.BasicMachine.0.name = tile.BasicMachine.0.name =
tile.BasicMachine.4.name = tile.BasicMachine.4.name =
@ -89,6 +91,9 @@ tile.dark\:leadOre.name = Lead Ore
tile.dark\:bauxiteOre.name = Bauxite Stone tile.dark\:bauxiteOre.name = Bauxite Stone
tile.dark\:silverOre.name = Silver Ore tile.dark\:silverOre.name = Silver Ore
tile.DMBlockGas.name = Natural Gas
tile.DMBlockGas.15.Name = Natural Gas
tile.DMWire.0.name = Copper Wire tile.DMWire.0.name = Copper Wire
# Ore Items # Ore Items
item.dark\:WoodDust.name = Wood Dust item.dark\:WoodDust.name = Wood Dust
@ -211,9 +216,9 @@ item.circuitBasic.name=Analog Circuit
item.circuitAdvanced.name=Transistor Circuit item.circuitAdvanced.name=Transistor Circuit
item.circuitElite.name=Microprocessor Circuit item.circuitElite.name=Microprocessor Circuit
item.motor.name = DC Motor item.motor.name = DC Motor
item.IC_CHip.name = Integrated Circuit item.ic_chip.name = Integrated Circuit
item.copperCoil.name = Copper Coil item.copperCoil.name = Copper Coil
item.LaserDiode.name = Laser Diode item.laserDiode.name = Laser Diode
item.DMTools.0.name=Pipe Gauge item.DMTools.0.name=Pipe Gauge
item.DMTools.1.name=MultiMeter item.DMTools.1.name=MultiMeter
@ -222,6 +227,10 @@ item.FluidCan.name = Fluid Can
item.wrench.name = Wrench item.wrench.name = Wrench
item.dark:Battery.name=Battery
item.Vehicle.name = [Debug] Test Car
item.GlowRefinedSand.Black.name = Black Glowing Refined Sand item.GlowRefinedSand.Black.name = Black Glowing Refined Sand
item.GlowRefinedSand.Red.name = Red Glowing Refined Sand item.GlowRefinedSand.Red.name = Red Glowing Refined Sand
item.GlowRefinedSand.Green.name = Green Glowing Refined Sand item.GlowRefinedSand.Green.name = Green Glowing Refined Sand

View file

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View file

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 271 B

View file

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 282 B

View file

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View file

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 281 B

View file

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 211 B

View file

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 457 B

View file

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 349 B

View file

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

View file

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 305 B

View file

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 289 B

View file

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 328 B

View file

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 283 B

View file

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

View file

Before

Width:  |  Height:  |  Size: 334 B

After

Width:  |  Height:  |  Size: 334 B

View file

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 323 B

View file

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

View file

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

View file

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

View file

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 299 B

View file

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 289 B

View file

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

View file

Before

Width:  |  Height:  |  Size: 288 B

After

Width:  |  Height:  |  Size: 288 B

View file

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 315 B

View file

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 277 B

View file

Before

Width:  |  Height:  |  Size: 267 B

After

Width:  |  Height:  |  Size: 267 B

View file

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 276 B

View file

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 266 B

View file

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

View file

Before

Width:  |  Height:  |  Size: 267 B

After

Width:  |  Height:  |  Size: 267 B

View file

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 247 B

View file

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 290 B

View file

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 247 B

View file

Before

Width:  |  Height:  |  Size: 335 B

After

Width:  |  Height:  |  Size: 335 B

View file

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 168 B

View file

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 148 B

View file

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 178 B

View file

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 150 B

View file

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 179 B

View file

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 291 B

View file

Before

Width:  |  Height:  |  Size: 269 B

After

Width:  |  Height:  |  Size: 269 B

View file

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 305 B

View file

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 243 B

View file

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 290 B

View file

@ -93,7 +93,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
} }
if (itemStack.getTagCompound().getBoolean(BROKEN_NBT)) if (itemStack.getTagCompound().getBoolean(BROKEN_NBT))
{ {
list.add("Broken"); list.add("Blunted");
} }
else else
{ {
@ -473,7 +473,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
{ {
if (tool.enabled) if (tool.enabled)
{ {
mat.toolIcons[tool.ordinal()] = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + mat.simpleName + tool.name); mat.toolIcons[tool.ordinal()] = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "tool." + mat.simpleName + tool.name);
} }
} }
} }

View file

@ -58,7 +58,7 @@ public class ItemParts extends ItemBasic implements IExtraItemInfo
super.registerIcons(iconRegister); super.registerIcons(iconRegister);
for (Parts part : Parts.values()) for (Parts part : Parts.values())
{ {
part.icon = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + part.name); part.icon = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "part." + part.name);
} }
} }
@ -91,9 +91,9 @@ public class ItemParts extends ItemBasic implements IExtraItemInfo
CircuitAdvanced("circuitAdvanced"), CircuitAdvanced("circuitAdvanced"),
CircuitElite("circuitElite"), CircuitElite("circuitElite"),
Motor("motor"), Motor("motor"),
IC("IC_Chip"), IC("ic_chip"),
COIL("copperCoil"), COIL("copperCoil"),
LASER("LaserDiode"); LASER("laserDiode");
public String name; public String name;
public Icon icon; public Icon icon;

View file

@ -8,6 +8,7 @@ import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.item.ItemElectric; import universalelectricity.core.item.ItemElectric;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import dark.core.DMCreativeTab;
import dark.core.interfaces.IExtraInfo.IExtraItemInfo; import dark.core.interfaces.IExtraInfo.IExtraItemInfo;
import dark.core.prefab.ModPrefab; import dark.core.prefab.ModPrefab;
import dark.machines.DarkMain; import dark.machines.DarkMain;
@ -21,13 +22,7 @@ public class ItemBattery extends ItemElectric implements IExtraItemInfo
{ {
super(DarkMain.CONFIGURATION.getItem("Battery", ModPrefab.getNextItemId()).getInt()); super(DarkMain.CONFIGURATION.getItem("Battery", ModPrefab.getNextItemId()).getInt());
this.setUnlocalizedName(DarkMain.getInstance().PREFIX + "Battery"); this.setUnlocalizedName(DarkMain.getInstance().PREFIX + "Battery");
this.setCreativeTab(CreativeTabs.tabRedstone); this.setCreativeTab(DMCreativeTab.tabIndustrial);
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack)
{
return "item." + this.getUnlocalizedName();
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -45,8 +45,8 @@ public class ItemReadoutTools extends ItemBasic
@Override @Override
public void registerIcons(IconRegister iconRegister) public void registerIcons(IconRegister iconRegister)
{ {
this.pipeGuage = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "PipeGauge"); this.pipeGuage = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "readout.PipeGauge");
this.multiMeter = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "multi-Meter"); this.multiMeter = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "readout.multi-Meter");
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)