diff --git a/src/main/resources/assets/opencomputers/lang/de_DE.lang b/src/main/resources/assets/opencomputers/lang/de_DE.lang index 5216d4f50..d329c9cb9 100644 --- a/src/main/resources/assets/opencomputers/lang/de_DE.lang +++ b/src/main/resources/assets/opencomputers/lang/de_DE.lang @@ -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) diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang index 07d666009..9f7eb1283 100644 --- a/src/main/resources/assets/opencomputers/lang/en_US.lang +++ b/src/main/resources/assets/opencomputers/lang/en_US.lang @@ -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) diff --git a/src/main/resources/assets/opencomputers/lang/fr_FR.lang b/src/main/resources/assets/opencomputers/lang/fr_FR.lang index 058e747b9..e4e68e8f8 100644 --- a/src/main/resources/assets/opencomputers/lang/fr_FR.lang +++ b/src/main/resources/assets/opencomputers/lang/fr_FR.lang @@ -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) diff --git a/src/main/resources/assets/opencomputers/lang/ru_RU.lang b/src/main/resources/assets/opencomputers/lang/ru_RU.lang index e67e76cab..a1ecfbf88 100644 --- a/src/main/resources/assets/opencomputers/lang/ru_RU.lang +++ b/src/main/resources/assets/opencomputers/lang/ru_RU.lang @@ -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) diff --git a/src/main/resources/assets/opencomputers/lang/zh_TW.lang b/src/main/resources/assets/opencomputers/lang/zh_TW.lang index 87ddb695e..6fe88ee43 100644 --- a/src/main/resources/assets/opencomputers/lang/zh_TW.lang +++ b/src/main/resources/assets/opencomputers/lang/zh_TW.lang @@ -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級) diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes index 9fdfb4b45..b4625b6d3 100644 --- a/src/main/resources/assets/opencomputers/recipes/default.recipes +++ b/src/main/resources/assets/opencomputers/recipes/default.recipes @@ -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 { diff --git a/src/main/resources/assets/opencomputers/recipes/gregtech.recipes b/src/main/resources/assets/opencomputers/recipes/gregtech.recipes index 98c76932f..55a4d3b54 100644 --- a/src/main/resources/assets/opencomputers/recipes/gregtech.recipes +++ b/src/main/resources/assets/opencomputers/recipes/gregtech.recipes @@ -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 { diff --git a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes index eeb8ffe6d..66ac1b83e 100644 --- a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes +++ b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes @@ -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] diff --git a/src/main/resources/assets/opencomputers/textures/items/memory0.png b/src/main/resources/assets/opencomputers/textures/items/memory0.png index 4158e553e..7f372124d 100644 Binary files a/src/main/resources/assets/opencomputers/textures/items/memory0.png and b/src/main/resources/assets/opencomputers/textures/items/memory0.png differ diff --git a/src/main/resources/assets/opencomputers/textures/items/memory1.png b/src/main/resources/assets/opencomputers/textures/items/memory1.png index d61e552f2..53efb704d 100644 Binary files a/src/main/resources/assets/opencomputers/textures/items/memory1.png and b/src/main/resources/assets/opencomputers/textures/items/memory1.png differ diff --git a/src/main/resources/assets/opencomputers/textures/items/memory2.png b/src/main/resources/assets/opencomputers/textures/items/memory2.png index 1163de4c4..d1522c9b5 100644 Binary files a/src/main/resources/assets/opencomputers/textures/items/memory2.png and b/src/main/resources/assets/opencomputers/textures/items/memory2.png differ diff --git a/src/main/resources/assets/opencomputers/textures/items/memory3.png b/src/main/resources/assets/opencomputers/textures/items/memory3.png index 290f1349b..84bbc73f6 100644 Binary files a/src/main/resources/assets/opencomputers/textures/items/memory3.png and b/src/main/resources/assets/opencomputers/textures/items/memory3.png differ diff --git a/src/main/resources/assets/opencomputers/textures/items/memory4.png b/src/main/resources/assets/opencomputers/textures/items/memory4.png index 41f2411c8..a732b1716 100644 Binary files a/src/main/resources/assets/opencomputers/textures/items/memory4.png and b/src/main/resources/assets/opencomputers/textures/items/memory4.png differ diff --git a/src/main/resources/assets/opencomputers/textures/items/memory5.png b/src/main/resources/assets/opencomputers/textures/items/memory5.png new file mode 100644 index 000000000..2a851fa24 Binary files /dev/null and b/src/main/resources/assets/opencomputers/textures/items/memory5.png differ diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index e528416bd..47e013196 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -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 diff --git a/src/main/scala/li/cil/oc/Items.scala b/src/main/scala/li/cil/oc/Items.scala index 09ebc388d..6df5ded19 100644 --- a/src/main/scala/li/cil/oc/Items.scala +++ b/src/main/scala/li/cil/oc/Items.scala @@ -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()) diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index d528d2aed..d1d317dda 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -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 { diff --git a/src/main/scala/li/cil/oc/common/item/Memory.scala b/src/main/scala/li/cil/oc/common/item/Memory.scala index 40ceefd2a..3dc31f42d 100644 --- a/src/main/scala/li/cil/oc/common/item/Memory.scala +++ b/src/main/scala/li/cil/oc/common/item/Memory.scala @@ -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)) diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala index 65ed76000..a344b8654 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala @@ -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