From 399e0f44e6e6088a8b95f011011d817cbec45177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 20 Mar 2016 19:22:07 +0100 Subject: [PATCH] This is now a one-way street. --- .../assets/opencomputers/lang/en_US.lang | 4 +- .../opencomputers/recipes/default.recipes | 39 ++++++++---------- .../opencomputers/recipes/hardmode.recipes | 5 --- .../textures/items/DiamondChip.png | Bin 0 -> 215 bytes .../textures/items/DiamondNugget.png | Bin 209 -> 0 bytes src/main/scala/li/cil/oc/Constants.scala | 2 +- src/main/scala/li/cil/oc/common/Proxy.scala | 2 +- .../scala/li/cil/oc/common/init/Items.scala | 2 +- .../li/cil/oc/common/item/DiamondChip.scala | 3 ++ .../li/cil/oc/common/item/DiamondNugget.scala | 3 -- .../opencomputers/ModOpenComputers.scala | 4 +- 11 files changed, 29 insertions(+), 35 deletions(-) create mode 100644 src/main/resources/assets/opencomputers/textures/items/DiamondChip.png delete mode 100644 src/main/resources/assets/opencomputers/textures/items/DiamondNugget.png create mode 100644 src/main/scala/li/cil/oc/common/item/DiamondChip.scala delete mode 100644 src/main/scala/li/cil/oc/common/item/DiamondNugget.scala diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang index 68aef59c1..9fa64316e 100644 --- a/src/main/resources/assets/opencomputers/lang/en_US.lang +++ b/src/main/resources/assets/opencomputers/lang/en_US.lang @@ -67,7 +67,7 @@ item.oc.DataCard1.name=Data Card (Tier 2) item.oc.DataCard2.name=Data Card (Tier 3) item.oc.DebugCard.name=Debug Card item.oc.Debugger.name=Network Debugger -item.oc.DiamondNugget.name=Diamond Nugget +item.oc.DiamondChip.name=Diamond Chip item.oc.Disk.name=Disk Platter item.oc.DiskDriveMountable.name=Disk Drive item.oc.Drone.name=Drone @@ -278,7 +278,7 @@ oc:tooltip.DataCard1=Provides a couple of advanced algorithms such as hashing, A oc:tooltip.DataCard2=Provides a couple of advanced algorithms such as hashing, AES encryption, elliptic curve cryptography and deflate/inflate. oc:tooltip.DebugCard=Creative mode item, allows manipulating the world to make testing easier. Use at your own peril. oc:tooltip.Debugger=Can be used to output debug information on OC's internal network grid. Only use if so instructed by a dev. -oc:tooltip.DiamondNugget=A small piece of a once radiant diamond. The pieces fit together flawlessly. +oc:tooltip.DiamondChip=A small piece of a once radiant diamond. It will never be the same again. oc:tooltip.Disassembler=Separates items into their original components. §lWarning§7: returned items have a %s%% chance of breaking in the process! oc:tooltip.Disk=Primitive medium that can be used to build persistent storage devices. oc:tooltip.DiskDrive.CC=ComputerCraft floppies are §asupported§7. diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes index a009ef9d6..d006c6b61 100644 --- a/src/main/resources/assets/opencomputers/recipes/default.recipes +++ b/src/main/resources/assets/opencomputers/recipes/default.recipes @@ -169,7 +169,7 @@ dataCard2 { ["", "oc:materialCard", ""]] } dataCard3 { - input: [[nuggetDiamond, "oc:cpu2", "oc:ram5"] + input: [[chipDiamond, "oc:cpu2", "oc:ram5"] ["", "oc:materialCard", ""]] } graphicsCard1 { @@ -237,7 +237,7 @@ batteryUpgrade2 { } batteryUpgrade3 { input: [[nuggetIron, "oc:capacitor", nuggetIron] - ["oc:capacitor", nuggetDiamond, "oc:capacitor"] + ["oc:capacitor", chipDiamond, "oc:capacitor"] [nuggetIron, "oc:capacitor", nuggetIron]] } chunkloaderUpgrade { @@ -380,20 +380,17 @@ nuggetIron { output: 9 } ingotIron { - input: [[nuggetIron, nuggetIron, nuggetIron], - [nuggetIron, nuggetIron, nuggetIron], - [nuggetIron, nuggetIron, nuggetIron]] + type: shapeless + input: [nuggetIron, nuggetIron, nuggetIron, + nuggetIron, nuggetIron, nuggetIron, + nuggetIron, nuggetIron, nuggetIron] } -nuggetDiamond { +chipDiamond { type: shapeless input: gemDiamond - output: 9 -} -gemDiamond { - input: [[nuggetDiamond, nuggetDiamond, nuggetDiamond], - [nuggetDiamond, nuggetDiamond, nuggetDiamond], - [nuggetDiamond, nuggetDiamond, nuggetDiamond]] + output: 6 } +gemDiamond = false cuttingWire = false acid { @@ -465,9 +462,9 @@ chip2 { output: 4 } chip3 { - input: [[nuggetDiamond, nuggetDiamond, nuggetDiamond] + input: [[chipDiamond, chipDiamond, chipDiamond] [redstone, "oc:materialTransistor", redstone] - [nuggetDiamond, nuggetDiamond, nuggetDiamond]] + [chipDiamond, chipDiamond, chipDiamond]] output: 2 } alu { @@ -481,9 +478,9 @@ apu1 { [nuggetGold, "oc:circuitChip1", nuggetGold]] } apu2 { - input: [[nuggetDiamond, "oc:circuitChip2", nuggetDiamond] + input: [[chipDiamond, "oc:circuitChip2", chipDiamond] ["oc:cpu3", "oc:componentBus2", "oc:graphicsCard2"] - [nuggetDiamond, "oc:circuitChip2", nuggetDiamond]] + [chipDiamond, "oc:circuitChip2", chipDiamond]] } componentBus1 { input: [[nuggetIron, redstone, nuggetIron] @@ -496,9 +493,9 @@ componentBus2 { [nuggetGold, "oc:materialCircuitBoardPrinted", nuggetGold]] } componentBus3 { - input: [[nuggetDiamond, redstone, nuggetDiamond] + input: [[chipDiamond, redstone, chipDiamond] ["oc:circuitChip3", "oc:materialCU", ""] - [nuggetDiamond, "oc:materialCircuitBoardPrinted", nuggetDiamond]] + [chipDiamond, "oc:materialCircuitBoardPrinted", chipDiamond]] } cpu1 { input: [[nuggetIron, redstone, nuggetIron] @@ -511,9 +508,9 @@ cpu2 { [nuggetGold, "oc:materialALU", nuggetGold]] } cpu3 { - input: [[nuggetDiamond, redstone, nuggetDiamond] + input: [[chipDiamond, redstone, chipDiamond] ["oc:circuitChip3", "oc:materialCU", "oc:circuitChip3"] - [nuggetDiamond, "oc:materialALU", nuggetDiamond]] + [chipDiamond, "oc:materialALU", chipDiamond]] } cu { input: [[nuggetGold, redstone, nuggetGold] @@ -601,7 +598,7 @@ geolyzer { } hologram1 { input: [["oc:circuitChip2", paneGlass, "oc:circuitChip2"] - ["oc:materialCircuitBoardPrinted", nuggetDiamond, "oc:materialCircuitBoardPrinted"] + ["oc:materialCircuitBoardPrinted", chipDiamond, "oc:materialCircuitBoardPrinted"] [obsidian, yellowDust, obsidian]] } hologram2 { diff --git a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes index eee57616c..a7485dcb1 100644 --- a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes +++ b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes @@ -187,11 +187,6 @@ tradingUpgrade { [dropper, "oc:materialCircuitBoardPrinted", craftingPiston]] } -nuggetIron { - type: shapeless - input: ingotIron - output: 9 -} cuttingWire { input: [[stickWood, nuggetIron, stickWood]] } diff --git a/src/main/resources/assets/opencomputers/textures/items/DiamondChip.png b/src/main/resources/assets/opencomputers/textures/items/DiamondChip.png new file mode 100644 index 0000000000000000000000000000000000000000..addf4179329bfea72859033346ad6bad962e014e GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fo=>VS)SL@kRRN|vAzk3t1Z~Llyw_bn$_W%F?YwzCz$IT;5g7A22WQ%mvv4FO#rP) BNPGYQ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/opencomputers/textures/items/DiamondNugget.png b/src/main/resources/assets/opencomputers/textures/items/DiamondNugget.png deleted file mode 100644 index 447b8190af3be7bae5622d768e2e498f75f89b30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fo=>VS)SL@kRRN|vo-MjVr`?vr9|A*|`e)-*-YwzCz*+=)P zS^$-CmIV0)1G!+p5bR$e1Qay)ba4!+xRvz4fte?T+rYqJ0f)hc%?8GcI5rq;HZ)ws xxxr}B48~vv@q{E*g#!l