mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-17 11:15:12 -04:00
Added tier 1.5 RAM. So many files touched, so little changed.
Using RAM T1.5 for robots' built-in ram sizes.
This commit is contained in:
Florian Nücke
parent
44c78504b9
commit
7e19d2b8d7
@ -51,10 +51,11 @@ oc:item.InternetCard.name=Internetkarte
|
||||
oc:item.Interweb.name=Interweb
|
||||
oc:item.IronNugget.name=Eisennugget
|
||||
oc:item.Memory0.name=Speicher (Stufe 1)
|
||||
oc:item.Memory1.name=Speicher (Stufe 2)
|
||||
oc:item.Memory2.name=Speicher (Stufe 2.5)
|
||||
oc:item.Memory3.name=Speicher (Stufe 3)
|
||||
oc:item.Memory4.name=Speicher (Stufe 3.5)
|
||||
oc:item.Memory1.name=Speicher (Stufe 1.5)
|
||||
oc:item.Memory2.name=Speicher (Stufe 2)
|
||||
oc:item.Memory3.name=Speicher (Stufe 2.5)
|
||||
oc:item.Memory4.name=Speicher (Stufe 3)
|
||||
oc:item.Memory5.name=Speicher (Stufe 3.5)
|
||||
oc:item.Microchip0.name=Microchip (Stufe 1)
|
||||
oc:item.Microchip1.name=Microchip (Stufe 2)
|
||||
oc:item.Microchip2.name=Microchip (Stufe 3)
|
||||
|
||||
@ -51,10 +51,11 @@ oc:item.InternetCard.name=Internet Card
|
||||
oc:item.Interweb.name=Interweb
|
||||
oc:item.IronNugget.name=Iron Nugget
|
||||
oc:item.Memory0.name=Memory (Tier 1)
|
||||
oc:item.Memory1.name=Memory (Tier 2)
|
||||
oc:item.Memory2.name=Memory (Tier 2.5)
|
||||
oc:item.Memory3.name=Memory (Tier 3)
|
||||
oc:item.Memory4.name=Memory (Tier 3.5)
|
||||
oc:item.Memory1.name=Memory (Tier 1.5)
|
||||
oc:item.Memory2.name=Memory (Tier 2)
|
||||
oc:item.Memory3.name=Memory (Tier 2.5)
|
||||
oc:item.Memory4.name=Memory (Tier 3)
|
||||
oc:item.Memory5.name=Memory (Tier 3.5)
|
||||
oc:item.Microchip0.name=Microchip (Tier 1)
|
||||
oc:item.Microchip1.name=Microchip (Tier 2)
|
||||
oc:item.Microchip2.name=Microchip (Tier 3)
|
||||
|
||||
@ -41,10 +41,11 @@ oc:item.HardDiskDrive1.name=Disque dur (Niveau 2)
|
||||
oc:item.HardDiskDrive2.name=Disque dur (Niveau 3)
|
||||
oc:item.IronNugget.name=Pépite de fer
|
||||
oc:item.Memory0.name=Mémoire (Niveau 1)
|
||||
oc:item.Memory1.name=Mémoire (Niveau 2)
|
||||
oc:item.Memory2.name=Mémoire (Niveau 2.5)
|
||||
oc:item.Memory3.name=Mémoire (Niveau 3)
|
||||
oc:item.Memory4.name=Mémoire (Niveau 3.5)
|
||||
oc:item.Memory1.name=Mémoire (Niveau 1.5)
|
||||
oc:item.Memory2.name=Mémoire (Niveau 2)
|
||||
oc:item.Memory3.name=Mémoire (Niveau 2.5)
|
||||
oc:item.Memory4.name=Mémoire (Niveau 3)
|
||||
oc:item.Memory5.name=Mémoire (Niveau 3.5)
|
||||
oc:item.Microchip0.name=Puce électronique (Niveau 1)
|
||||
oc:item.Microchip1.name=Puce électronique (Niveau 2)
|
||||
oc:item.Microchip2.name=Puce électronique (Niveau 3)
|
||||
|
||||
@ -51,10 +51,11 @@ oc:item.InternetCard.name=Интернет-плата
|
||||
oc:item.Interweb.name=Интерсеть
|
||||
oc:item.IronNugget.name=Железный самородок
|
||||
oc:item.Memory0.name=ОЗУ (Ур. 1)
|
||||
oc:item.Memory1.name=ОЗУ (Ур. 2)
|
||||
oc:item.Memory2.name=ОЗУ (Ур. 2.5)
|
||||
oc:item.Memory3.name=ОЗУ (Ур. 3)
|
||||
oc:item.Memory4.name=ОЗУ (Ур. 3.5)
|
||||
oc:item.Memory1.name=ОЗУ (Ур. 1.5)
|
||||
oc:item.Memory2.name=ОЗУ (Ур. 2)
|
||||
oc:item.Memory3.name=ОЗУ (Ур. 2.5)
|
||||
oc:item.Memory4.name=ОЗУ (Ур. 3)
|
||||
oc:item.Memory5.name=ОЗУ (Ур. 3.5)
|
||||
oc:item.Microchip0.name=Микрочип (Ур. 1)
|
||||
oc:item.Microchip1.name=Микрочип (Ур. 2)
|
||||
oc:item.Microchip2.name=Микрочип (Ур. 3)
|
||||
|
||||
@ -48,10 +48,11 @@ oc:item.HardDiskDrive2.name=硬碟機 (3級)
|
||||
oc:item.InternetCard.name=上網卡
|
||||
oc:item.IronNugget.name=鐵粒
|
||||
oc:item.Memory0.name=記憶卡 (1級)
|
||||
oc:item.Memory1.name=記憶卡 (2級)
|
||||
oc:item.Memory2.name=記憶卡 (2.5級)
|
||||
oc:item.Memory3.name=記憶卡 (3級)
|
||||
oc:item.Memory4.name=記憶卡 (3.5級)
|
||||
oc:item.Memory1.name=記憶卡 (1.5級)
|
||||
oc:item.Memory2.name=記憶卡 (2級)
|
||||
oc:item.Memory3.name=記憶卡 (2.5級)
|
||||
oc:item.Memory4.name=記憶卡 (3級)
|
||||
oc:item.Memory5.name=記憶卡 (3.5級)
|
||||
oc:item.Microchip0.name=微晶片 (1級)
|
||||
oc:item.Microchip1.name=微晶片 (2級)
|
||||
oc:item.Microchip2.name=微晶片 (3級)
|
||||
|
||||
@ -13,17 +13,17 @@ terminal {
|
||||
}
|
||||
|
||||
server1 {
|
||||
input: [[obsidian, "oc:craftingRAMTier3", obsidian]
|
||||
input: [[obsidian, "oc:craftingRAMTier4", obsidian]
|
||||
["oc:circuitTier1", "oc:circuitTier2", "oc:circuitTier1"]
|
||||
[obsidian, "oc:craftingCircuitBoardPrinted", obsidian]]
|
||||
}
|
||||
server2 {
|
||||
input: [[obsidian, "oc:craftingRAMTier4", obsidian]
|
||||
input: [[obsidian, "oc:craftingRAMTier5", obsidian]
|
||||
["oc:circuitTier2", "oc:circuitTier3", "oc:circuitTier2"]
|
||||
[obsidian, "oc:craftingCircuitBoardPrinted", obsidian]]
|
||||
}
|
||||
server3 {
|
||||
input: [[obsidian, "oc:craftingRAMTier5", obsidian]
|
||||
input: [[obsidian, "oc:craftingRAMTier6", obsidian]
|
||||
["oc:circuitTier3", "oc:circuitTier3", "oc:circuitTier3"]
|
||||
[obsidian, "oc:craftingCircuitBoardPrinted", obsidian]]
|
||||
}
|
||||
@ -33,18 +33,22 @@ ram1 {
|
||||
["", "oc:craftingCircuitBoardPrinted", ""]]
|
||||
}
|
||||
ram2 {
|
||||
input: [["oc:circuitTier2", "", "oc:circuitTier2"]
|
||||
input: [["oc:circuitTier1", "oc:circuitTier1", "oc:circuitTier1"]
|
||||
["", "oc:craftingCircuitBoardPrinted", ""]]
|
||||
}
|
||||
ram3 {
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:circuitTier2"]
|
||||
input: [["oc:circuitTier2", "", "oc:circuitTier2"]
|
||||
["", "oc:craftingCircuitBoardPrinted", ""]]
|
||||
}
|
||||
ram4 {
|
||||
input: [["oc:circuitTier3", "", "oc:circuitTier3"]
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:circuitTier2"]
|
||||
["", "oc:craftingCircuitBoardPrinted", ""]]
|
||||
}
|
||||
ram5 {
|
||||
input: [["oc:circuitTier3", "", "oc:circuitTier3"]
|
||||
["", "oc:craftingCircuitBoardPrinted", ""]]
|
||||
}
|
||||
ram6 {
|
||||
input: [["oc:circuitTier3", "oc:circuitTier3", "oc:circuitTier3"]
|
||||
["", "oc:craftingCircuitBoardPrinted", ""]]
|
||||
}
|
||||
@ -79,11 +83,11 @@ graphicsCard1 {
|
||||
["", "oc:craftingCard", ""]]
|
||||
}
|
||||
graphicsCard2 {
|
||||
input: [["oc:circuitTier2", "oc:craftingALU", "oc:craftingRAMTier2"]
|
||||
input: [["oc:circuitTier2", "oc:craftingALU", "oc:craftingRAMTier3"]
|
||||
["", "oc:craftingCard", ""]]
|
||||
}
|
||||
graphicsCard3 {
|
||||
input: [["oc:circuitTier3", "oc:craftingALU", "oc:craftingRAMTier4"]
|
||||
input: [["oc:circuitTier3", "oc:craftingALU", "oc:craftingRAMTier5"]
|
||||
["", "oc:craftingCard", ""]]
|
||||
}
|
||||
internetCard {
|
||||
|
||||
@ -9,8 +9,18 @@ analyzer {
|
||||
[screwAluminium, craftingToolScrewdriver, screwAluminium]]
|
||||
}
|
||||
|
||||
server {
|
||||
input: [["oc:circuitTier3", "oc:craftingRAMTier4", "oc:circuitTier3"]
|
||||
server1 {
|
||||
input: [["oc:circuitTier1", "oc:craftingRAMTier4", "oc:circuitTier1"]
|
||||
["oc:circuitTier1", "oc:craftingCaseTier1", "oc:circuitTier2"]
|
||||
[craftingToolScrewdriver, "oc:craftingCircuitBoardPrinted", craftingToolWrench]]
|
||||
}
|
||||
server2 {
|
||||
input: [["oc:circuitTier2", "oc:craftingRAMTier5", "oc:circuitTier2"]
|
||||
["oc:circuitTier3", "oc:craftingCaseTier2", "oc:circuitTier3"]
|
||||
[craftingToolScrewdriver, "oc:craftingCircuitBoardPrinted", craftingToolWrench]]
|
||||
}
|
||||
server3 {
|
||||
input: [["oc:circuitTier3", "oc:craftingRAMTier6", "oc:circuitTier3"]
|
||||
["oc:circuitTier3", "oc:craftingCaseTier3", "oc:circuitTier3"]
|
||||
[craftingToolScrewdriver, "oc:craftingCircuitBoardPrinted", craftingToolWrench]]
|
||||
}
|
||||
@ -23,9 +33,9 @@ ram1 {
|
||||
time: 250
|
||||
}
|
||||
ram2 {
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:circuitTier2"]
|
||||
["oc:craftingRAMTier1", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier1"]
|
||||
[Dataorb, craftingToolWrench, Dataorb]]
|
||||
input: [["oc:circuitTier1", "oc:circuitTier1", "oc:circuitTier1"]
|
||||
["", "oc:craftingRAMTier1", ""]
|
||||
["", craftingToolWrench, ""]]
|
||||
}
|
||||
ram3 {
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:circuitTier2"]
|
||||
@ -33,7 +43,7 @@ ram3 {
|
||||
[Dataorb, craftingToolWrench, Dataorb]]
|
||||
}
|
||||
ram4 {
|
||||
input: [["oc:circuitTier3", "oc:circuitTier3", "oc:circuitTier3"]
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:circuitTier2"]
|
||||
["oc:craftingRAMTier3", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier3"]
|
||||
[Dataorb, craftingToolWrench, Dataorb]]
|
||||
}
|
||||
@ -42,6 +52,11 @@ ram5 {
|
||||
["oc:craftingRAMTier4", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier4"]
|
||||
[Dataorb, craftingToolWrench, Dataorb]]
|
||||
}
|
||||
ram6 {
|
||||
input: [["oc:circuitTier3", "oc:circuitTier3", "oc:circuitTier3"]
|
||||
["oc:craftingRAMTier5", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier5"]
|
||||
[Dataorb, craftingToolWrench, Dataorb]]
|
||||
}
|
||||
|
||||
floppy {
|
||||
input: [[screwAluminium, lever, screwAluminium]
|
||||
@ -174,12 +189,12 @@ cpu0 {
|
||||
}
|
||||
cpu1 {
|
||||
input: [["oc:circuitTier2", plateStainlessSteel, "oc:circuitTier2"]
|
||||
["oc:craftingRAMTier2", "oc:craftingCPUTier1", "oc:craftingRAMTier2"]
|
||||
["oc:craftingRAMTier3", "oc:craftingCPUTier1", "oc:craftingRAMTier3"]
|
||||
["oc:circuitTier2", craftingToolScrewdriver, "oc:circuitTier2"]]
|
||||
}
|
||||
cpu2 {
|
||||
input: [["oc:circuitTier3", plateTitanium, "oc:circuitTier3"]
|
||||
["oc:craftingRAMTier4", "oc:craftingCPUTier2", "oc:craftingRAMTier4"]
|
||||
["oc:craftingRAMTier5", "oc:craftingCPUTier2", "oc:craftingRAMTier5"]
|
||||
["oc:circuitTier3", craftingToolScrewdriver, "oc:circuitTier3"]]
|
||||
}
|
||||
cu {
|
||||
|
||||
@ -15,17 +15,17 @@ terminal {
|
||||
}
|
||||
|
||||
server1 {
|
||||
input: [["oc:circuitTier1", "oc:craftingRAMTier3", "oc:circuitTier1"]
|
||||
input: [["oc:circuitTier1", "oc:craftingRAMTier4", "oc:circuitTier1"]
|
||||
["oc:circuitTier2", "oc:craftingCaseTier1", "oc:circuitTier2"]
|
||||
["oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted"]]
|
||||
}
|
||||
server2 {
|
||||
input: [["oc:circuitTier2", "oc:craftingRAMTier4", "oc:circuitTier2"]
|
||||
input: [["oc:circuitTier2", "oc:craftingRAMTier5", "oc:circuitTier2"]
|
||||
["oc:circuitTier3", "oc:craftingCaseTier2", "oc:circuitTier3"]
|
||||
["oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted"]]
|
||||
}
|
||||
server3 {
|
||||
input: [["oc:circuitTier3", "oc:craftingRAMTier5", "oc:circuitTier3"]
|
||||
input: [["oc:circuitTier3", "oc:craftingRAMTier6", "oc:circuitTier3"]
|
||||
["oc:circuitTier3", "oc:craftingCaseTier3", "oc:circuitTier3"]
|
||||
["oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted"]]
|
||||
}
|
||||
@ -36,20 +36,24 @@ ram1 {
|
||||
}
|
||||
ram2 {
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:circuitTier2"]
|
||||
["oc:craftingRAMTier1", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier1"]]
|
||||
["", "oc:craftingRAMTier1", ""]]
|
||||
}
|
||||
ram3 {
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:circuitTier2"]
|
||||
["oc:craftingRAMTier2", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier2"]]
|
||||
}
|
||||
ram4 {
|
||||
input: [["oc:circuitTier3", "oc:circuitTier3", "oc:circuitTier3"]
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:circuitTier2"]
|
||||
["oc:craftingRAMTier3", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier3"]]
|
||||
}
|
||||
ram5 {
|
||||
input: [["oc:circuitTier3", "oc:circuitTier3", "oc:circuitTier3"]
|
||||
["oc:craftingRAMTier4", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier4"]]
|
||||
}
|
||||
ram6 {
|
||||
input: [["oc:circuitTier3", "oc:circuitTier3", "oc:circuitTier3"]
|
||||
["oc:craftingRAMTier5", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMTier5"]]
|
||||
}
|
||||
|
||||
floppy {
|
||||
input: [[nuggetIron, lever, nuggetIron]
|
||||
@ -81,11 +85,11 @@ graphicsCard1 {
|
||||
["", "oc:craftingCard", ""]]
|
||||
}
|
||||
graphicsCard2 {
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:craftingRAMTier2"]
|
||||
input: [["oc:circuitTier2", "oc:circuitTier2", "oc:craftingRAMTier3"]
|
||||
["", "oc:craftingGPUTier1", ""]]
|
||||
}
|
||||
graphicsCard3 {
|
||||
input: [["oc:circuitTier3", "oc:circuitTier3", "oc:craftingRAMTier4"]
|
||||
input: [["oc:circuitTier3", "oc:circuitTier3", "oc:craftingRAMTier5"]
|
||||
["", "oc:craftingGPUTier2", ""]]
|
||||
}
|
||||
internetCard {
|
||||
@ -193,14 +197,14 @@ cpu0 {
|
||||
[nuggetIron, "oc:craftingALU", nuggetIron]]
|
||||
}
|
||||
cpu1 {
|
||||
input: [[nuggetGold, "oc:craftingRAMTier2", nuggetGold]
|
||||
input: [[nuggetGold, "oc:craftingRAMTier3", nuggetGold]
|
||||
["oc:circuitTier2", "oc:craftingCPUTier1", "oc:circuitTier2"]
|
||||
[nuggetGold, "oc:craftingRAMTier2", nuggetGold]]
|
||||
[nuggetGold, "oc:craftingRAMTier3", nuggetGold]]
|
||||
}
|
||||
cpu2 {
|
||||
input: [[diamond, "oc:craftingRAMTier4", diamond]
|
||||
input: [[diamond, "oc:craftingRAMTier5", diamond]
|
||||
["oc:circuitTier3", "oc:craftingCPUTier2", "oc:circuitTier3"]
|
||||
[diamond, "oc:craftingRAMTier4", diamond]]
|
||||
[diamond, "oc:craftingRAMTier5", diamond]]
|
||||
}
|
||||
cu {
|
||||
input: [[nuggetGold, torchRedstoneActive, nuggetGold]
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 308 B After Width: | Height: | Size: 308 B |
Binary file not shown.
|
Before Width: | Height: | Size: 322 B After Width: | Height: | Size: 300 B |
Binary file not shown.
|
Before Width: | Height: | Size: 281 B After Width: | Height: | Size: 322 B |
Binary file not shown.
|
Before Width: | Height: | Size: 323 B After Width: | Height: | Size: 281 B |
Binary file not shown.
|
Before Width: | Height: | Size: 281 B After Width: | Height: | Size: 323 B |
Binary file not shown.
|
After Width: | Height: | Size: 281 B |
@ -111,12 +111,13 @@ opencomputers {
|
||||
# run in a low-priority worker thread, this should be barely noticeable.
|
||||
activeGC: true
|
||||
|
||||
# The sizes of the five levels of RAM, in kilobytes. This list must
|
||||
# contain exactly five entries, or it will be ignored. Note that while
|
||||
# there are five levels of RAM, they still fall into the three tiers of
|
||||
# items (level 1 = tier 1, level 2, 3 = tier 2, level 4, 5 = tier 3).
|
||||
# The sizes of the six levels of RAM, in kilobytes. This list must
|
||||
# contain exactly six entries, or it will be ignored. Note that while
|
||||
# there are six levels of RAM, they still fall into the three tiers of
|
||||
# items (level 1, 2 = tier 1, level 3, 4 = tier 2, level 5, 6 = tier 3).
|
||||
ramSizes: [
|
||||
64
|
||||
96
|
||||
128
|
||||
256
|
||||
512
|
||||
|
||||
@ -22,7 +22,7 @@ object Items {
|
||||
|
||||
// ----------------------------------------------------------------------- //
|
||||
// Memory
|
||||
var ram1, ram2, ram3, ram4, ram5: item.Memory = _
|
||||
var ram1, ram2, ram3, ram4, ram5, ram6: item.Memory = _
|
||||
|
||||
// ----------------------------------------------------------------------- //
|
||||
// Storage
|
||||
@ -79,8 +79,8 @@ object Items {
|
||||
analyzer = Recipes.addItemDelegate(new item.Analyzer(multi), "analyzer")
|
||||
|
||||
ram1 = Recipes.addItemDelegate(new item.Memory(multi, 0), "ram1")
|
||||
ram2 = Recipes.addItemDelegate(new item.Memory(multi, 1), "ram2")
|
||||
ram3 = Recipes.addItemDelegate(new item.Memory(multi, 2), "ram3")
|
||||
ram4 = Recipes.addItemDelegate(new item.Memory(multi, 3), "ram4")
|
||||
|
||||
floppyDisk = Recipes.addItemDelegate(new item.FloppyDisk(multi), "floppy")
|
||||
hdd1 = Recipes.addItemDelegate(new item.HardDiskDrive(multi, 0), "hdd1")
|
||||
@ -130,8 +130,8 @@ object Items {
|
||||
Recipes.addItemDelegate(abstractBus, "abstractBusCard")
|
||||
}
|
||||
|
||||
ram4 = Recipes.addItemDelegate(new item.Memory(multi, 3), "ram4")
|
||||
ram5 = Recipes.addItemDelegate(new item.Memory(multi, 4), "ram5")
|
||||
ram6 = Recipes.addItemDelegate(new item.Memory(multi, 5), "ram6")
|
||||
|
||||
// v1.2.0
|
||||
server3 = Recipes.addItemDelegate(new item.Server(multi, 2), "server3")
|
||||
@ -150,6 +150,7 @@ object Items {
|
||||
// v1.2.6
|
||||
interweb = Recipes.addItemDelegate(new item.Interweb(multi), "interweb")
|
||||
upgradeAngel = Recipes.addItemDelegate(new item.UpgradeAngel(multi), "angelUpgrade")
|
||||
ram2 = Recipes.addItemDelegate(new item.Memory(multi, 1), "ram2")
|
||||
|
||||
// Initialize API.
|
||||
api.Items.AbstractBusCard = abstractBus.createItemStack()
|
||||
@ -211,6 +212,7 @@ object Items {
|
||||
register("oc:craftingRAMTier3", ram3.createItemStack())
|
||||
register("oc:craftingRAMTier4", ram4.createItemStack())
|
||||
register("oc:craftingRAMTier5", ram5.createItemStack())
|
||||
register("oc:craftingRAMTier6", ram6.createItemStack())
|
||||
|
||||
register("oc:craftingHDDTier1", hdd1.createItemStack())
|
||||
register("oc:craftingHDDTier2", hdd2.createItemStack())
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package li.cil.oc
|
||||
|
||||
import com.typesafe.config.{ConfigRenderOptions, Config, ConfigFactory}
|
||||
import cpw.mods.fml.common.{ModAPIManager, Loader}
|
||||
import java.io._
|
||||
import java.util.logging.Level
|
||||
import li.cil.oc.util.PackedColor
|
||||
@ -43,11 +42,14 @@ class Settings(config: Config) {
|
||||
case Array(tier1, tier2, tier3) =>
|
||||
// For compatibility with older config files.
|
||||
Array(tier1: Int, tier2: Int, tier3: Int, tier3 * 2: Int, tier3 * 4: Int)
|
||||
case Array(tier1, tier2, tier3, tier4, tier5) =>
|
||||
Array(tier1: Int, tier2: Int, tier3: Int, tier4: Int, tier5: Int)
|
||||
case Array(tier1, tier3, tier4, tier5, tier6) =>
|
||||
// For compatibility with older config files.
|
||||
Array(tier1: Int, (tier1: Int) * 3 / 2, tier3: Int, tier4: Int, tier5: Int, tier6: Int)
|
||||
case Array(tier1, tier2, tier3, tier4, tier5, tier6) =>
|
||||
Array(tier1: Int, tier2: Int, tier3: Int, tier4: Int, tier5: Int, tier6: Int)
|
||||
case _ =>
|
||||
OpenComputers.log.warning("Bad number of RAM sizes, ignoring.")
|
||||
Array(64, 128, 256, 512, 1024)
|
||||
Array(64, 96, 128, 256, 512, 1024)
|
||||
}
|
||||
val ramScaleFor64Bit = config.getDouble("computer.ramScaleFor64Bit") max 1
|
||||
val cpuComponentSupport = Array(config.getIntList("computer.cpuComponentCount"): _*) match {
|
||||
|
||||
@ -14,7 +14,7 @@ class Memory(val parent: Delegator, val tier: Int) extends Delegate {
|
||||
|
||||
val kiloBytes = Settings.get.ramSizes(tier)
|
||||
|
||||
override def rarity = Array(EnumRarity.common, EnumRarity.uncommon, EnumRarity.uncommon, EnumRarity.rare, EnumRarity.rare).apply(tier max 0 min 4)
|
||||
override def rarity = Array(EnumRarity.common, EnumRarity.common, EnumRarity.uncommon, EnumRarity.uncommon, EnumRarity.rare, EnumRarity.rare).apply(tier max 0 min Settings.get.ramSizes.length)
|
||||
|
||||
override def displayName(stack: ItemStack) =
|
||||
Some(parent.getItemStackDisplayName(stack) + " (%dKB)".format(kiloBytes))
|
||||
|
||||
@ -543,7 +543,7 @@ class Robot(val isRemote: Boolean) extends traits.Computer with traits.TextBuffe
|
||||
|
||||
// ----------------------------------------------------------------------- //
|
||||
|
||||
override def installedMemory = 96 * 1024
|
||||
override def installedMemory = Settings.get.ramSizes(1) * 1024
|
||||
|
||||
override def tier = 0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user