From ac79b3c696dfc015ea980fd37e64e1f0c27f8317 Mon Sep 17 00:00:00 2001 From: Johannes Lohrer Date: Sun, 1 Dec 2013 00:16:55 +0100 Subject: [PATCH 1/2] circuit board names --- assets/opencomputers/lang/de_DE.lang | 2 ++ assets/opencomputers/lang/en_US.lang | 2 ++ li/cil/oc/Items.scala | 8 ++++---- li/cil/oc/common/item/CircuitBoard.scala | 6 ++++++ li/cil/oc/common/item/Platine.scala | 6 ------ li/cil/oc/common/item/PlatineBody.scala | 6 ------ li/cil/oc/common/item/PrintedCircuitBoard.scala | 6 ++++++ 7 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 li/cil/oc/common/item/CircuitBoard.scala delete mode 100644 li/cil/oc/common/item/Platine.scala delete mode 100644 li/cil/oc/common/item/PlatineBody.scala create mode 100644 li/cil/oc/common/item/PrintedCircuitBoard.scala diff --git a/assets/opencomputers/lang/de_DE.lang b/assets/opencomputers/lang/de_DE.lang index 486ce7a13..877846d25 100644 --- a/assets/opencomputers/lang/de_DE.lang +++ b/assets/opencomputers/lang/de_DE.lang @@ -31,6 +31,8 @@ oc:item.NetworkCard.name=Netzwerkkarte oc:item.RedstoneCard.name=Redstonekarte oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte oc:item.IronNugget.name=Eisennugget +oc:item.CircuitBoard.name=Basis Platte +oc:item.PrintedCircuitBoard.name=Leiterplatte # GUI oc:gui.Analyzer.Address=Adresse diff --git a/assets/opencomputers/lang/en_US.lang b/assets/opencomputers/lang/en_US.lang index 189b39c49..5a74017e6 100644 --- a/assets/opencomputers/lang/en_US.lang +++ b/assets/opencomputers/lang/en_US.lang @@ -35,6 +35,8 @@ oc:item.NetworkCard.name=Network Card oc:item.RedstoneCard.name=Redstone Card oc:item.WirelessNetworkCard.name=Wireless Network Card oc:item.IronNugget.name=Iron Nugget +oc:item.CircuitBoard.name=Circuit Board +oc:item.PrintedCircuitBoard.name=Printed Circuit Board(PCB) # GUI oc:gui.Analyzer.Address=Address diff --git a/li/cil/oc/Items.scala b/li/cil/oc/Items.scala index 2c4212365..b4e6487a2 100644 --- a/li/cil/oc/Items.scala +++ b/li/cil/oc/Items.scala @@ -36,8 +36,8 @@ object Items { // ----------------------------------------------------------------------- // // Crafting var card1, card2, card3: item.Card = null - var circuitBoardBody: item.PlatineBody = null - var circuitBoard: item.Platine = null + var circuitBoardBody: item.CircuitBoard = null + var circuitBoard: item.PrintedCircuitBoard = null var ironCutter: item.IronCutter = null var chip1, chip2, chip3: item.Chip = null var numPad: item.Numpad = null @@ -76,8 +76,8 @@ object Items { card1 = new item.Card(multi, 0) card2 = new item.Card(multi, 1) card3 = new item.Card(multi, 2) - circuitBoardBody = new item.PlatineBody(multi) - circuitBoard = new item.Platine(multi) + circuitBoardBody = new item.CircuitBoard(multi) + circuitBoard = new item.PrintedCircuitBoard(multi) ironCutter = new item.IronCutter(multi) diff --git a/li/cil/oc/common/item/CircuitBoard.scala b/li/cil/oc/common/item/CircuitBoard.scala new file mode 100644 index 000000000..501ffeef5 --- /dev/null +++ b/li/cil/oc/common/item/CircuitBoard.scala @@ -0,0 +1,6 @@ +package li.cil.oc.common.item + + +class CircuitBoard (val parent: Delegator) extends Delegate { +val unlocalizedName = "CircuitBoard" +} diff --git a/li/cil/oc/common/item/Platine.scala b/li/cil/oc/common/item/Platine.scala deleted file mode 100644 index fe44bc747..000000000 --- a/li/cil/oc/common/item/Platine.scala +++ /dev/null @@ -1,6 +0,0 @@ -package li.cil.oc.common.item - - -class Platine (val parent: Delegator) extends Delegate { - val unlocalizedName = "Platine" -} diff --git a/li/cil/oc/common/item/PlatineBody.scala b/li/cil/oc/common/item/PlatineBody.scala deleted file mode 100644 index c5e924ed6..000000000 --- a/li/cil/oc/common/item/PlatineBody.scala +++ /dev/null @@ -1,6 +0,0 @@ -package li.cil.oc.common.item - - -class PlatineBody (val parent: Delegator) extends Delegate { -val unlocalizedName = "PlatineBody" -} diff --git a/li/cil/oc/common/item/PrintedCircuitBoard.scala b/li/cil/oc/common/item/PrintedCircuitBoard.scala new file mode 100644 index 000000000..9356f45ee --- /dev/null +++ b/li/cil/oc/common/item/PrintedCircuitBoard.scala @@ -0,0 +1,6 @@ +package li.cil.oc.common.item + + +class PrintedCircuitBoard (val parent: Delegator) extends Delegate { + val unlocalizedName = "PrintedCircuitBoard" +} From 27743d49613b8b69d7b623ae74811f3c72769b62 Mon Sep 17 00:00:00 2001 From: Johannes Lohrer Date: Sun, 1 Dec 2013 00:31:39 +0100 Subject: [PATCH 2/2] more localization --- assets/opencomputers/lang/de_DE.lang | 8 ++++++++ assets/opencomputers/lang/en_US.lang | 8 ++++++++ li/cil/oc/Items.scala | 4 ++-- li/cil/oc/common/item/Alu.scala | 2 +- li/cil/oc/common/item/ButtonGroup.scala | 2 +- li/cil/oc/common/item/ControlUnit.scala | 2 +- li/cil/oc/common/item/CuttingWire.scala | 6 ++++++ li/cil/oc/common/item/IronCutter.scala | 6 ------ 8 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 li/cil/oc/common/item/CuttingWire.scala delete mode 100644 li/cil/oc/common/item/IronCutter.scala diff --git a/assets/opencomputers/lang/de_DE.lang b/assets/opencomputers/lang/de_DE.lang index 877846d25..ee95d5518 100644 --- a/assets/opencomputers/lang/de_DE.lang +++ b/assets/opencomputers/lang/de_DE.lang @@ -33,6 +33,14 @@ oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte oc:item.IronNugget.name=Eisennugget oc:item.CircuitBoard.name=Basis Platte oc:item.PrintedCircuitBoard.name=Leiterplatte +oc:item.NumPad.name=Ziffernblock +oc:item.ArrowKeys.name=Pfeiltasten +oc:item.CuttingWire.name=Schneidedraht +oc:item.ButtonGroup.name=Tastengruppe +oc:item.Transistor.name=Transistor +oc:item.ArithmeticLogicUnit.name=Arithmetisch-logische Einheit (ALU) +oc:item.ControlUnit.name=Steuerwerk (CU) +oc:item.CPU.name=Hauptprozessor (CPU) # GUI oc:gui.Analyzer.Address=Adresse diff --git a/assets/opencomputers/lang/en_US.lang b/assets/opencomputers/lang/en_US.lang index 5a74017e6..103af04b5 100644 --- a/assets/opencomputers/lang/en_US.lang +++ b/assets/opencomputers/lang/en_US.lang @@ -37,6 +37,14 @@ oc:item.WirelessNetworkCard.name=Wireless Network Card oc:item.IronNugget.name=Iron Nugget oc:item.CircuitBoard.name=Circuit Board oc:item.PrintedCircuitBoard.name=Printed Circuit Board(PCB) +oc:item.NumPad.name=Numeric Keypad +oc:item.ArrowKeys.name=Arrow Keys +oc:item.CuttingWire.name=Cutting Wire +oc:item.ButtonGroup.name=Button Group +oc:item.Transistor.name=Transistor +oc:item.ArithmeticLogicUnit.name=Arithmetic Logic Unit (ALU) +oc:item.ControlUnit.name=Control Unit (CU) +oc:item.CPU.name=Central Processing Unit (CPU) # GUI oc:gui.Analyzer.Address=Address diff --git a/li/cil/oc/Items.scala b/li/cil/oc/Items.scala index a10f8a02b..bc44bb3d4 100644 --- a/li/cil/oc/Items.scala +++ b/li/cil/oc/Items.scala @@ -38,7 +38,7 @@ object Items { var card1, card2, card3: item.Card = null var circuitBoardBody: item.CircuitBoard = null var circuitBoard: item.PrintedCircuitBoard = null - var ironCutter: item.IronCutter = null + var ironCutter: item.CuttingWire = null var chip1, chip2, chip3: item.Chip = null var numPad: item.Numpad = null var arrowKeys: item.ArrowKeys = null @@ -78,7 +78,7 @@ object Items { card3 = new item.Card(multi, 2) circuitBoardBody = new item.CircuitBoard(multi) circuitBoard = new item.PrintedCircuitBoard(multi) - ironCutter = new item.IronCutter(multi) + ironCutter = new item.CuttingWire(multi) chip1 = new item.Chip(multi, 0) diff --git a/li/cil/oc/common/item/Alu.scala b/li/cil/oc/common/item/Alu.scala index 4ae6a7fee..394203828 100644 --- a/li/cil/oc/common/item/Alu.scala +++ b/li/cil/oc/common/item/Alu.scala @@ -4,7 +4,7 @@ import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IconRegister class ALU(val parent: Delegator) extends Delegate { - val unlocalizedName = "ALU" + val unlocalizedName = "ArithmeticLogicUnit" override def registerIcons(iconRegister: IconRegister) { super.registerIcons(iconRegister) diff --git a/li/cil/oc/common/item/ButtonGroup.scala b/li/cil/oc/common/item/ButtonGroup.scala index c5d6a1a2c..cae9b45fc 100644 --- a/li/cil/oc/common/item/ButtonGroup.scala +++ b/li/cil/oc/common/item/ButtonGroup.scala @@ -2,5 +2,5 @@ package li.cil.oc.common.item class ButtonGroup (val parent: Delegator) extends Delegate { - val unlocalizedName = "buttonGroup" + val unlocalizedName = "ButtonGroup" } diff --git a/li/cil/oc/common/item/ControlUnit.scala b/li/cil/oc/common/item/ControlUnit.scala index eae8e0113..930c01be6 100644 --- a/li/cil/oc/common/item/ControlUnit.scala +++ b/li/cil/oc/common/item/ControlUnit.scala @@ -4,7 +4,7 @@ import li.cil.oc.Settings import net.minecraft.client.renderer.texture.IconRegister class ControlUnit(val parent: Delegator) extends Delegate { - val unlocalizedName = "CU" + val unlocalizedName = "ControlUnit" override def registerIcons(iconRegister: IconRegister) { super.registerIcons(iconRegister) diff --git a/li/cil/oc/common/item/CuttingWire.scala b/li/cil/oc/common/item/CuttingWire.scala new file mode 100644 index 000000000..629f82aa2 --- /dev/null +++ b/li/cil/oc/common/item/CuttingWire.scala @@ -0,0 +1,6 @@ +package li.cil.oc.common.item + + +class CuttingWire (val parent: Delegator) extends Delegate { + val unlocalizedName = "CuttingWire" +} diff --git a/li/cil/oc/common/item/IronCutter.scala b/li/cil/oc/common/item/IronCutter.scala deleted file mode 100644 index b537120a8..000000000 --- a/li/cil/oc/common/item/IronCutter.scala +++ /dev/null @@ -1,6 +0,0 @@ -package li.cil.oc.common.item - - -class IronCutter (val parent: Delegator) extends Delegate { - val unlocalizedName = "IronCutter" -}