From 561e52ed46136dcd0cbd63118a736fc1d9d78abf Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 12 Dec 2013 14:01:35 -0500 Subject: [PATCH] reworked textures and langs a bit --- .../assets/dark/languages/en_US.properties | 25 ++++++++++++------ ...tAdvanced.png => part.circuitAdvanced.png} | Bin ...CircuitBasic.png => part.circuitBasic.png} | Bin ...CircuitElite.png => part.circuitElite.png} | Bin .../items/{gasSeal.png => part.gasSeal.png} | Bin .../items/{IC_CHIP.png => part.ic_chip.png} | Bin .../{LeatherSeal.png => part.leatherSeal.png} | Bin .../items/{Motor.png => part.motor.png} | Bin ...nishedTank.png => part.unfinishedTank.png} | Bin .../{ValvePart.png => part.valvePart.png} | Bin .../{miningIcon.png => partminingIcon.png} | Bin .../{PipeGauge.png => readout.PipeGauge.png} | Bin ...ulti-Meter.png => readout.multi-Meter.png} | Bin .../{Aluminumaxe.png => tool.Aluminumaxe.png} | Bin .../{Aluminumhoe.png => tool.Aluminumhoe.png} | Bin ...umpickaxe.png => tool.Aluminumpickaxe.png} | Bin ...inumshovel.png => tool.Aluminumshovel.png} | Bin ...uminumsword.png => tool.Aluminumsword.png} | Bin .../{Bronzeaxe.png => tool.Bronzeaxe.png} | Bin .../{Bronzehoe.png => tool.Bronzehoe.png} | Bin ...onzepickaxe.png => tool.Bronzepickaxe.png} | Bin ...Bronzeshovel.png => tool.Bronzeshovel.png} | Bin .../{Bronzesword.png => tool.Bronzesword.png} | Bin .../{Copperaxe.png => tool.Copperaxe.png} | Bin .../{Copperhoe.png => tool.Copperhoe.png} | Bin ...pperpickaxe.png => tool.Copperpickaxe.png} | Bin ...Coppershovel.png => tool.Coppershovel.png} | Bin .../{Coppersword.png => tool.Coppersword.png} | Bin .../items/{Obbyaxe.png => tool.Obbyaxe.png} | Bin .../items/{Obbyhoe.png => tool.Obbyhoe.png} | Bin .../{Obbypickaxe.png => tool.Obbypickaxe.png} | Bin .../{Obbyshovel.png => tool.Obbyshovel.png} | Bin .../{Obbysword.png => tool.Obbysword.png} | Bin .../{Silveraxe.png => tool.Silveraxe.png} | Bin .../{Silverhoe.png => tool.Silverhoe.png} | Bin ...lverpickaxe.png => tool.Silverpickaxe.png} | Bin ...Silvershovel.png => tool.Silvershovel.png} | Bin .../{Silversword.png => tool.Silversword.png} | Bin .../items/{Steelaxe.png => tool.Steelaxe.png} | Bin .../items/{Steelhoe.png => tool.Steelhoe.png} | Bin ...Steelpickaxe.png => tool.Steelpickaxe.png} | Bin .../{Steelshovel.png => tool.Steelshovel.png} | Bin .../{Steelsword.png => tool.Steelsword.png} | Bin .../items/{Tinaxe.png => tool.Tinaxe.png} | Bin .../items/{Tinhoe.png => tool.Tinhoe.png} | Bin .../{Tinpickaxe.png => tool.Tinpickaxe.png} | Bin .../{Tinshovel.png => tool.Tinshovel.png} | Bin .../items/{Tinsword.png => tool.Tinsword.png} | Bin src/dark/core/basics/ItemCommonTool.java | 4 +-- src/dark/core/basics/ItemParts.java | 6 ++--- src/dark/machines/items/ItemBattery.java | 9 ++----- src/dark/machines/items/ItemReadoutTools.java | 4 +-- 52 files changed, 26 insertions(+), 22 deletions(-) rename resources/assets/dark/textures/items/{CircuitAdvanced.png => part.circuitAdvanced.png} (100%) rename resources/assets/dark/textures/items/{CircuitBasic.png => part.circuitBasic.png} (100%) rename resources/assets/dark/textures/items/{CircuitElite.png => part.circuitElite.png} (100%) rename resources/assets/dark/textures/items/{gasSeal.png => part.gasSeal.png} (100%) rename resources/assets/dark/textures/items/{IC_CHIP.png => part.ic_chip.png} (100%) rename resources/assets/dark/textures/items/{LeatherSeal.png => part.leatherSeal.png} (100%) rename resources/assets/dark/textures/items/{Motor.png => part.motor.png} (100%) rename resources/assets/dark/textures/items/{UnfinishedTank.png => part.unfinishedTank.png} (100%) rename resources/assets/dark/textures/items/{ValvePart.png => part.valvePart.png} (100%) rename resources/assets/dark/textures/items/{miningIcon.png => partminingIcon.png} (100%) rename resources/assets/dark/textures/items/{PipeGauge.png => readout.PipeGauge.png} (100%) rename resources/assets/dark/textures/items/{multi-Meter.png => readout.multi-Meter.png} (100%) rename resources/assets/dark/textures/items/{Aluminumaxe.png => tool.Aluminumaxe.png} (100%) rename resources/assets/dark/textures/items/{Aluminumhoe.png => tool.Aluminumhoe.png} (100%) rename resources/assets/dark/textures/items/{Aluminumpickaxe.png => tool.Aluminumpickaxe.png} (100%) rename resources/assets/dark/textures/items/{Aluminumshovel.png => tool.Aluminumshovel.png} (100%) rename resources/assets/dark/textures/items/{Aluminumsword.png => tool.Aluminumsword.png} (100%) rename resources/assets/dark/textures/items/{Bronzeaxe.png => tool.Bronzeaxe.png} (100%) rename resources/assets/dark/textures/items/{Bronzehoe.png => tool.Bronzehoe.png} (100%) rename resources/assets/dark/textures/items/{Bronzepickaxe.png => tool.Bronzepickaxe.png} (100%) rename resources/assets/dark/textures/items/{Bronzeshovel.png => tool.Bronzeshovel.png} (100%) rename resources/assets/dark/textures/items/{Bronzesword.png => tool.Bronzesword.png} (100%) rename resources/assets/dark/textures/items/{Copperaxe.png => tool.Copperaxe.png} (100%) rename resources/assets/dark/textures/items/{Copperhoe.png => tool.Copperhoe.png} (100%) rename resources/assets/dark/textures/items/{Copperpickaxe.png => tool.Copperpickaxe.png} (100%) rename resources/assets/dark/textures/items/{Coppershovel.png => tool.Coppershovel.png} (100%) rename resources/assets/dark/textures/items/{Coppersword.png => tool.Coppersword.png} (100%) rename resources/assets/dark/textures/items/{Obbyaxe.png => tool.Obbyaxe.png} (100%) rename resources/assets/dark/textures/items/{Obbyhoe.png => tool.Obbyhoe.png} (100%) rename resources/assets/dark/textures/items/{Obbypickaxe.png => tool.Obbypickaxe.png} (100%) rename resources/assets/dark/textures/items/{Obbyshovel.png => tool.Obbyshovel.png} (100%) rename resources/assets/dark/textures/items/{Obbysword.png => tool.Obbysword.png} (100%) rename resources/assets/dark/textures/items/{Silveraxe.png => tool.Silveraxe.png} (100%) rename resources/assets/dark/textures/items/{Silverhoe.png => tool.Silverhoe.png} (100%) rename resources/assets/dark/textures/items/{Silverpickaxe.png => tool.Silverpickaxe.png} (100%) rename resources/assets/dark/textures/items/{Silvershovel.png => tool.Silvershovel.png} (100%) rename resources/assets/dark/textures/items/{Silversword.png => tool.Silversword.png} (100%) rename resources/assets/dark/textures/items/{Steelaxe.png => tool.Steelaxe.png} (100%) rename resources/assets/dark/textures/items/{Steelhoe.png => tool.Steelhoe.png} (100%) rename resources/assets/dark/textures/items/{Steelpickaxe.png => tool.Steelpickaxe.png} (100%) rename resources/assets/dark/textures/items/{Steelshovel.png => tool.Steelshovel.png} (100%) rename resources/assets/dark/textures/items/{Steelsword.png => tool.Steelsword.png} (100%) rename resources/assets/dark/textures/items/{Tinaxe.png => tool.Tinaxe.png} (100%) rename resources/assets/dark/textures/items/{Tinhoe.png => tool.Tinhoe.png} (100%) rename resources/assets/dark/textures/items/{Tinpickaxe.png => tool.Tinpickaxe.png} (100%) rename resources/assets/dark/textures/items/{Tinshovel.png => tool.Tinshovel.png} (100%) rename resources/assets/dark/textures/items/{Tinsword.png => tool.Tinsword.png} (100%) diff --git a/resources/assets/dark/languages/en_US.properties b/resources/assets/dark/languages/en_US.properties index ad6a9f339..dcb74bc8f 100644 --- a/resources/assets/dark/languages/en_US.properties +++ b/resources/assets/dark/languages/en_US.properties @@ -4,11 +4,13 @@ itemGroup.Automation = Automation itemGroup.Industrial = Industrial 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 -tile.DebugBlock.0.name = Unlimited Power -tile.DebugBlock.1.name = Unlimited Fluid -tile.DebugBlock.2.name = Fluid Void -tile.DebugBlock.3.name = Power Void +tile.DebugBlock.0.name = [Creative]Unlimited Power +tile.DebugBlock.1.name = [Creative]Unlimited Fluid +tile.DebugBlock.2.name = [Creative]Fluid Void +tile.DebugBlock.3.name = [Creative]Power Void tile.colorSand.Black.name = Black Sand tile.colorSand.Red.name = Red Sand @@ -68,10 +70,10 @@ tile.basaltchiseled.name = Chiseled Basalt Bricks tile.basaltmossy.name = Mossy 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.1.name = Capacitor Box +tile.DMEnergyStorage.1.name = [WIP]Capacitor Box tile.BasicMachine.0.name = tile.BasicMachine.4.name = @@ -89,6 +91,9 @@ tile.dark\:leadOre.name = Lead Ore tile.dark\:bauxiteOre.name = Bauxite Stone tile.dark\:silverOre.name = Silver Ore +tile.DMBlockGas.name = Natural Gas +tile.DMBlockGas.15.Name = Natural Gas + tile.DMWire.0.name = Copper Wire # Ore Items item.dark\:WoodDust.name = Wood Dust @@ -211,9 +216,9 @@ item.circuitBasic.name=Analog Circuit item.circuitAdvanced.name=Transistor Circuit item.circuitElite.name=Microprocessor Circuit item.motor.name = DC Motor -item.IC_CHip.name = Integrated Circuit +item.ic_chip.name = Integrated Circuit item.copperCoil.name = Copper Coil -item.LaserDiode.name = Laser Diode +item.laserDiode.name = Laser Diode item.DMTools.0.name=Pipe Gauge item.DMTools.1.name=MultiMeter @@ -222,6 +227,10 @@ item.FluidCan.name = Fluid Can 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.Red.name = Red Glowing Refined Sand item.GlowRefinedSand.Green.name = Green Glowing Refined Sand diff --git a/resources/assets/dark/textures/items/CircuitAdvanced.png b/resources/assets/dark/textures/items/part.circuitAdvanced.png similarity index 100% rename from resources/assets/dark/textures/items/CircuitAdvanced.png rename to resources/assets/dark/textures/items/part.circuitAdvanced.png diff --git a/resources/assets/dark/textures/items/CircuitBasic.png b/resources/assets/dark/textures/items/part.circuitBasic.png similarity index 100% rename from resources/assets/dark/textures/items/CircuitBasic.png rename to resources/assets/dark/textures/items/part.circuitBasic.png diff --git a/resources/assets/dark/textures/items/CircuitElite.png b/resources/assets/dark/textures/items/part.circuitElite.png similarity index 100% rename from resources/assets/dark/textures/items/CircuitElite.png rename to resources/assets/dark/textures/items/part.circuitElite.png diff --git a/resources/assets/dark/textures/items/gasSeal.png b/resources/assets/dark/textures/items/part.gasSeal.png similarity index 100% rename from resources/assets/dark/textures/items/gasSeal.png rename to resources/assets/dark/textures/items/part.gasSeal.png diff --git a/resources/assets/dark/textures/items/IC_CHIP.png b/resources/assets/dark/textures/items/part.ic_chip.png similarity index 100% rename from resources/assets/dark/textures/items/IC_CHIP.png rename to resources/assets/dark/textures/items/part.ic_chip.png diff --git a/resources/assets/dark/textures/items/LeatherSeal.png b/resources/assets/dark/textures/items/part.leatherSeal.png similarity index 100% rename from resources/assets/dark/textures/items/LeatherSeal.png rename to resources/assets/dark/textures/items/part.leatherSeal.png diff --git a/resources/assets/dark/textures/items/Motor.png b/resources/assets/dark/textures/items/part.motor.png similarity index 100% rename from resources/assets/dark/textures/items/Motor.png rename to resources/assets/dark/textures/items/part.motor.png diff --git a/resources/assets/dark/textures/items/UnfinishedTank.png b/resources/assets/dark/textures/items/part.unfinishedTank.png similarity index 100% rename from resources/assets/dark/textures/items/UnfinishedTank.png rename to resources/assets/dark/textures/items/part.unfinishedTank.png diff --git a/resources/assets/dark/textures/items/ValvePart.png b/resources/assets/dark/textures/items/part.valvePart.png similarity index 100% rename from resources/assets/dark/textures/items/ValvePart.png rename to resources/assets/dark/textures/items/part.valvePart.png diff --git a/resources/assets/dark/textures/items/miningIcon.png b/resources/assets/dark/textures/items/partminingIcon.png similarity index 100% rename from resources/assets/dark/textures/items/miningIcon.png rename to resources/assets/dark/textures/items/partminingIcon.png diff --git a/resources/assets/dark/textures/items/PipeGauge.png b/resources/assets/dark/textures/items/readout.PipeGauge.png similarity index 100% rename from resources/assets/dark/textures/items/PipeGauge.png rename to resources/assets/dark/textures/items/readout.PipeGauge.png diff --git a/resources/assets/dark/textures/items/multi-Meter.png b/resources/assets/dark/textures/items/readout.multi-Meter.png similarity index 100% rename from resources/assets/dark/textures/items/multi-Meter.png rename to resources/assets/dark/textures/items/readout.multi-Meter.png diff --git a/resources/assets/dark/textures/items/Aluminumaxe.png b/resources/assets/dark/textures/items/tool.Aluminumaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Aluminumaxe.png rename to resources/assets/dark/textures/items/tool.Aluminumaxe.png diff --git a/resources/assets/dark/textures/items/Aluminumhoe.png b/resources/assets/dark/textures/items/tool.Aluminumhoe.png similarity index 100% rename from resources/assets/dark/textures/items/Aluminumhoe.png rename to resources/assets/dark/textures/items/tool.Aluminumhoe.png diff --git a/resources/assets/dark/textures/items/Aluminumpickaxe.png b/resources/assets/dark/textures/items/tool.Aluminumpickaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Aluminumpickaxe.png rename to resources/assets/dark/textures/items/tool.Aluminumpickaxe.png diff --git a/resources/assets/dark/textures/items/Aluminumshovel.png b/resources/assets/dark/textures/items/tool.Aluminumshovel.png similarity index 100% rename from resources/assets/dark/textures/items/Aluminumshovel.png rename to resources/assets/dark/textures/items/tool.Aluminumshovel.png diff --git a/resources/assets/dark/textures/items/Aluminumsword.png b/resources/assets/dark/textures/items/tool.Aluminumsword.png similarity index 100% rename from resources/assets/dark/textures/items/Aluminumsword.png rename to resources/assets/dark/textures/items/tool.Aluminumsword.png diff --git a/resources/assets/dark/textures/items/Bronzeaxe.png b/resources/assets/dark/textures/items/tool.Bronzeaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Bronzeaxe.png rename to resources/assets/dark/textures/items/tool.Bronzeaxe.png diff --git a/resources/assets/dark/textures/items/Bronzehoe.png b/resources/assets/dark/textures/items/tool.Bronzehoe.png similarity index 100% rename from resources/assets/dark/textures/items/Bronzehoe.png rename to resources/assets/dark/textures/items/tool.Bronzehoe.png diff --git a/resources/assets/dark/textures/items/Bronzepickaxe.png b/resources/assets/dark/textures/items/tool.Bronzepickaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Bronzepickaxe.png rename to resources/assets/dark/textures/items/tool.Bronzepickaxe.png diff --git a/resources/assets/dark/textures/items/Bronzeshovel.png b/resources/assets/dark/textures/items/tool.Bronzeshovel.png similarity index 100% rename from resources/assets/dark/textures/items/Bronzeshovel.png rename to resources/assets/dark/textures/items/tool.Bronzeshovel.png diff --git a/resources/assets/dark/textures/items/Bronzesword.png b/resources/assets/dark/textures/items/tool.Bronzesword.png similarity index 100% rename from resources/assets/dark/textures/items/Bronzesword.png rename to resources/assets/dark/textures/items/tool.Bronzesword.png diff --git a/resources/assets/dark/textures/items/Copperaxe.png b/resources/assets/dark/textures/items/tool.Copperaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Copperaxe.png rename to resources/assets/dark/textures/items/tool.Copperaxe.png diff --git a/resources/assets/dark/textures/items/Copperhoe.png b/resources/assets/dark/textures/items/tool.Copperhoe.png similarity index 100% rename from resources/assets/dark/textures/items/Copperhoe.png rename to resources/assets/dark/textures/items/tool.Copperhoe.png diff --git a/resources/assets/dark/textures/items/Copperpickaxe.png b/resources/assets/dark/textures/items/tool.Copperpickaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Copperpickaxe.png rename to resources/assets/dark/textures/items/tool.Copperpickaxe.png diff --git a/resources/assets/dark/textures/items/Coppershovel.png b/resources/assets/dark/textures/items/tool.Coppershovel.png similarity index 100% rename from resources/assets/dark/textures/items/Coppershovel.png rename to resources/assets/dark/textures/items/tool.Coppershovel.png diff --git a/resources/assets/dark/textures/items/Coppersword.png b/resources/assets/dark/textures/items/tool.Coppersword.png similarity index 100% rename from resources/assets/dark/textures/items/Coppersword.png rename to resources/assets/dark/textures/items/tool.Coppersword.png diff --git a/resources/assets/dark/textures/items/Obbyaxe.png b/resources/assets/dark/textures/items/tool.Obbyaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Obbyaxe.png rename to resources/assets/dark/textures/items/tool.Obbyaxe.png diff --git a/resources/assets/dark/textures/items/Obbyhoe.png b/resources/assets/dark/textures/items/tool.Obbyhoe.png similarity index 100% rename from resources/assets/dark/textures/items/Obbyhoe.png rename to resources/assets/dark/textures/items/tool.Obbyhoe.png diff --git a/resources/assets/dark/textures/items/Obbypickaxe.png b/resources/assets/dark/textures/items/tool.Obbypickaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Obbypickaxe.png rename to resources/assets/dark/textures/items/tool.Obbypickaxe.png diff --git a/resources/assets/dark/textures/items/Obbyshovel.png b/resources/assets/dark/textures/items/tool.Obbyshovel.png similarity index 100% rename from resources/assets/dark/textures/items/Obbyshovel.png rename to resources/assets/dark/textures/items/tool.Obbyshovel.png diff --git a/resources/assets/dark/textures/items/Obbysword.png b/resources/assets/dark/textures/items/tool.Obbysword.png similarity index 100% rename from resources/assets/dark/textures/items/Obbysword.png rename to resources/assets/dark/textures/items/tool.Obbysword.png diff --git a/resources/assets/dark/textures/items/Silveraxe.png b/resources/assets/dark/textures/items/tool.Silveraxe.png similarity index 100% rename from resources/assets/dark/textures/items/Silveraxe.png rename to resources/assets/dark/textures/items/tool.Silveraxe.png diff --git a/resources/assets/dark/textures/items/Silverhoe.png b/resources/assets/dark/textures/items/tool.Silverhoe.png similarity index 100% rename from resources/assets/dark/textures/items/Silverhoe.png rename to resources/assets/dark/textures/items/tool.Silverhoe.png diff --git a/resources/assets/dark/textures/items/Silverpickaxe.png b/resources/assets/dark/textures/items/tool.Silverpickaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Silverpickaxe.png rename to resources/assets/dark/textures/items/tool.Silverpickaxe.png diff --git a/resources/assets/dark/textures/items/Silvershovel.png b/resources/assets/dark/textures/items/tool.Silvershovel.png similarity index 100% rename from resources/assets/dark/textures/items/Silvershovel.png rename to resources/assets/dark/textures/items/tool.Silvershovel.png diff --git a/resources/assets/dark/textures/items/Silversword.png b/resources/assets/dark/textures/items/tool.Silversword.png similarity index 100% rename from resources/assets/dark/textures/items/Silversword.png rename to resources/assets/dark/textures/items/tool.Silversword.png diff --git a/resources/assets/dark/textures/items/Steelaxe.png b/resources/assets/dark/textures/items/tool.Steelaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Steelaxe.png rename to resources/assets/dark/textures/items/tool.Steelaxe.png diff --git a/resources/assets/dark/textures/items/Steelhoe.png b/resources/assets/dark/textures/items/tool.Steelhoe.png similarity index 100% rename from resources/assets/dark/textures/items/Steelhoe.png rename to resources/assets/dark/textures/items/tool.Steelhoe.png diff --git a/resources/assets/dark/textures/items/Steelpickaxe.png b/resources/assets/dark/textures/items/tool.Steelpickaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Steelpickaxe.png rename to resources/assets/dark/textures/items/tool.Steelpickaxe.png diff --git a/resources/assets/dark/textures/items/Steelshovel.png b/resources/assets/dark/textures/items/tool.Steelshovel.png similarity index 100% rename from resources/assets/dark/textures/items/Steelshovel.png rename to resources/assets/dark/textures/items/tool.Steelshovel.png diff --git a/resources/assets/dark/textures/items/Steelsword.png b/resources/assets/dark/textures/items/tool.Steelsword.png similarity index 100% rename from resources/assets/dark/textures/items/Steelsword.png rename to resources/assets/dark/textures/items/tool.Steelsword.png diff --git a/resources/assets/dark/textures/items/Tinaxe.png b/resources/assets/dark/textures/items/tool.Tinaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Tinaxe.png rename to resources/assets/dark/textures/items/tool.Tinaxe.png diff --git a/resources/assets/dark/textures/items/Tinhoe.png b/resources/assets/dark/textures/items/tool.Tinhoe.png similarity index 100% rename from resources/assets/dark/textures/items/Tinhoe.png rename to resources/assets/dark/textures/items/tool.Tinhoe.png diff --git a/resources/assets/dark/textures/items/Tinpickaxe.png b/resources/assets/dark/textures/items/tool.Tinpickaxe.png similarity index 100% rename from resources/assets/dark/textures/items/Tinpickaxe.png rename to resources/assets/dark/textures/items/tool.Tinpickaxe.png diff --git a/resources/assets/dark/textures/items/Tinshovel.png b/resources/assets/dark/textures/items/tool.Tinshovel.png similarity index 100% rename from resources/assets/dark/textures/items/Tinshovel.png rename to resources/assets/dark/textures/items/tool.Tinshovel.png diff --git a/resources/assets/dark/textures/items/Tinsword.png b/resources/assets/dark/textures/items/tool.Tinsword.png similarity index 100% rename from resources/assets/dark/textures/items/Tinsword.png rename to resources/assets/dark/textures/items/tool.Tinsword.png diff --git a/src/dark/core/basics/ItemCommonTool.java b/src/dark/core/basics/ItemCommonTool.java index c12fbcbba..1df333bd2 100644 --- a/src/dark/core/basics/ItemCommonTool.java +++ b/src/dark/core/basics/ItemCommonTool.java @@ -93,7 +93,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo } if (itemStack.getTagCompound().getBoolean(BROKEN_NBT)) { - list.add("Broken"); + list.add("Blunted"); } else { @@ -473,7 +473,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo { 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); } } } diff --git a/src/dark/core/basics/ItemParts.java b/src/dark/core/basics/ItemParts.java index 0b5e49d98..1752199cd 100644 --- a/src/dark/core/basics/ItemParts.java +++ b/src/dark/core/basics/ItemParts.java @@ -58,7 +58,7 @@ public class ItemParts extends ItemBasic implements IExtraItemInfo super.registerIcons(iconRegister); 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"), CircuitElite("circuitElite"), Motor("motor"), - IC("IC_Chip"), + IC("ic_chip"), COIL("copperCoil"), - LASER("LaserDiode"); + LASER("laserDiode"); public String name; public Icon icon; diff --git a/src/dark/machines/items/ItemBattery.java b/src/dark/machines/items/ItemBattery.java index b5a3bfbbc..803c4d85a 100644 --- a/src/dark/machines/items/ItemBattery.java +++ b/src/dark/machines/items/ItemBattery.java @@ -8,6 +8,7 @@ import net.minecraftforge.oredict.OreDictionary; import universalelectricity.core.item.ItemElectric; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.core.DMCreativeTab; import dark.core.interfaces.IExtraInfo.IExtraItemInfo; import dark.core.prefab.ModPrefab; import dark.machines.DarkMain; @@ -21,13 +22,7 @@ public class ItemBattery extends ItemElectric implements IExtraItemInfo { super(DarkMain.CONFIGURATION.getItem("Battery", ModPrefab.getNextItemId()).getInt()); this.setUnlocalizedName(DarkMain.getInstance().PREFIX + "Battery"); - this.setCreativeTab(CreativeTabs.tabRedstone); - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) - { - return "item." + this.getUnlocalizedName(); + this.setCreativeTab(DMCreativeTab.tabIndustrial); } @SideOnly(Side.CLIENT) diff --git a/src/dark/machines/items/ItemReadoutTools.java b/src/dark/machines/items/ItemReadoutTools.java index cf6528605..a57165f9f 100644 --- a/src/dark/machines/items/ItemReadoutTools.java +++ b/src/dark/machines/items/ItemReadoutTools.java @@ -45,8 +45,8 @@ public class ItemReadoutTools extends ItemBasic @Override public void registerIcons(IconRegister iconRegister) { - this.pipeGuage = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "PipeGauge"); - this.multiMeter = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "multi-Meter"); + this.pipeGuage = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "readout.PipeGauge"); + this.multiMeter = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "readout.multi-Meter"); } @SideOnly(Side.CLIENT)