diff --git a/src/main/resources/assets/opencomputers/lang/en_us.json b/src/main/resources/assets/opencomputers/lang/en_us.json index 96b43e0372..62cfae0be7 100644 --- a/src/main/resources/assets/opencomputers/lang/en_us.json +++ b/src/main/resources/assets/opencomputers/lang/en_us.json @@ -139,9 +139,9 @@ "item.oc.server2": "Server (Tier 3)", "item.oc.server3": "Server (Tier 4)", "item.oc.server4": "Server (Creative)", - "item.oc.solidstatedrive0": "Solid State Drive (Tier 2)", - "item.oc.solidstatedrive1": "Solid State Drive (Tier 3)", - "item.oc.solidstatedrive2": "Solid State Drive (Tier 4)", + "item.oc.solidstatedrive1": "Solid State Drive (Tier 2)", + "item.oc.solidstatedrive2": "Solid State Drive (Tier 3)", + "item.oc.solidstatedrive3": "Solid State Drive (Tier 4)", "item.oc.tablet": "Tablet", "item.oc.tabletcase0": "Tablet Case (Tier 1)", "item.oc.tabletcase1": "Tablet Case (Tier 2)", diff --git a/src/main/resources/assets/opencomputers/lang/ru_ru.json b/src/main/resources/assets/opencomputers/lang/ru_ru.json index 09c9157e4e..1bb956495b 100644 --- a/src/main/resources/assets/opencomputers/lang/ru_ru.json +++ b/src/main/resources/assets/opencomputers/lang/ru_ru.json @@ -136,9 +136,9 @@ "item.oc.server2": "Сервер (3-ий уровень)", "item.oc.server3": "Сервер (4-ый уровень)", "item.oc.server4": "Сервер (Творческий)", - "item.oc.solidstatedrive0": "SSD (2-ый уровень)", - "item.oc.solidstatedrive1": "SSD (3-ой уровень)", - "item.oc.solidstatedrive2": "SSD (4-ий уровень)", + "item.oc.solidstatedrive1": "SSD (2-ый уровень)", + "item.oc.solidstatedrive2": "SSD (3-ой уровень)", + "item.oc.solidstatedrive3": "SSD (4-ий уровень)", "item.oc.tablet": "Планшет", "item.oc.tabletcase0": "Корпус планшета (1-ый уровень)", "item.oc.tabletcase1": "Корпус планшета (2-ой уровень)", diff --git a/src/main/resources/assets/opencomputers/lang/uk_ua.json b/src/main/resources/assets/opencomputers/lang/uk_ua.json index 1a825c3d84..729c07ea2a 100644 --- a/src/main/resources/assets/opencomputers/lang/uk_ua.json +++ b/src/main/resources/assets/opencomputers/lang/uk_ua.json @@ -138,9 +138,9 @@ "item.oc.server2": "Сервер (3-й рівень)", "item.oc.server3": "Сервер (4-й рівень)", "item.oc.server4": "Сервер (Творчий)", - "item.oc.solidstatedrive0": "Твердотілий накопичувач (SSD) (2-й рівень)", - "item.oc.solidstatedrive1": "Твердотілий накопичувач (SSD) (3-й рівень)", - "item.oc.solidstatedrive2": "Твердотілий накопичувач (SSD) (4-й рівень)", + "item.oc.solidstatedrive1": "Твердотілий накопичувач (SSD) (2-й рівень)", + "item.oc.solidstatedrive2": "Твердотілий накопичувач (SSD) (3-й рівень)", + "item.oc.solidstatedrive3": "Твердотілий накопичувач (SSD) (4-й рівень)", "item.oc.tablet": "Планшет", "item.oc.tabletcase0": "Корпус планшета (1-й рівень)", "item.oc.tabletcase1": "Корпус планшета (2-й рівень)", diff --git a/src/main/scala/li/cil/oc/common/init/OCItems.scala b/src/main/scala/li/cil/oc/common/init/OCItems.scala index d1cf38b1f5..e8831b1929 100644 --- a/src/main/scala/li/cil/oc/common/init/OCItems.scala +++ b/src/main/scala/li/cil/oc/common/init/OCItems.scala @@ -510,9 +510,9 @@ object OCItems extends ItemAPI { val HDDTier3: DeferredItem[item.HardDiskDrive] = registerItem(new item.HardDiskDrive(defaultProps.rarity(Rarity.RARE), Tier.Three), Constants.ItemName.HDDTier3, Constants.SectionName.Component) val HDDTier4: DeferredItem[item.HardDiskDrive] = registerItem(new item.HardDiskDrive(defaultProps.rarity(OCRarity.LEGENDARY), Tier.Four), Constants.ItemName.HDDTier4, Constants.SectionName.Component) - val SSDTier1: DeferredItem[item.SolidStateDrive] = registerItem(new item.SolidStateDrive(defaultProps.rarity(Rarity.UNCOMMON), Tier.One), Constants.ItemName.SSDTier1, Constants.SectionName.Component) - val SSDTier2: DeferredItem[item.SolidStateDrive] = registerItem(new item.SolidStateDrive(defaultProps.rarity(Rarity.RARE), Tier.Two), Constants.ItemName.SSDTier2, Constants.SectionName.Component) - val SSDTier3: DeferredItem[item.SolidStateDrive] = registerItem(new item.SolidStateDrive(defaultProps.rarity(OCRarity.LEGENDARY), Tier.Three), Constants.ItemName.SSDTier3, Constants.SectionName.Component) + val SSDTier1: DeferredItem[item.SolidStateDrive] = registerItem(new item.SolidStateDrive(defaultProps.rarity(Rarity.UNCOMMON), Tier.Two), Constants.ItemName.SSDTier1, Constants.SectionName.Component) + val SSDTier2: DeferredItem[item.SolidStateDrive] = registerItem(new item.SolidStateDrive(defaultProps.rarity(Rarity.RARE), Tier.Three), Constants.ItemName.SSDTier2, Constants.SectionName.Component) + val SSDTier3: DeferredItem[item.SolidStateDrive] = registerItem(new item.SolidStateDrive(defaultProps.rarity(OCRarity.LEGENDARY), Tier.Four), Constants.ItemName.SSDTier3, Constants.SectionName.Component) ///////////////////////////////////////////////////////////////// diff --git a/src/main/scala/li/cil/oc/common/item/SolidStateDrive.scala b/src/main/scala/li/cil/oc/common/item/SolidStateDrive.scala index 270dd2df51..eb1d7a6f9e 100644 --- a/src/main/scala/li/cil/oc/common/item/SolidStateDrive.scala +++ b/src/main/scala/li/cil/oc/common/item/SolidStateDrive.scala @@ -10,7 +10,7 @@ class SolidStateDrive(props: Properties, val tier: Int) extends Item(props) with @Deprecated override def getDescriptionId = super.getDescriptionId + tier - val kiloBytes: Int = Settings.get.ssdSizes(tier) + val kiloBytes: Int = Settings.get.ssdSizes(tier - 1) override def getName(stack: ItemStack): Component = { val localizedName = super.getName(stack).copy() @@ -22,4 +22,4 @@ class SolidStateDrive(props: Properties, val tier: Int) extends Item(props) with } localizedName } -} \ No newline at end of file +}