Skip to content

Fix SSDs being registered as the wrong tier #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CaitlynMainer merged 1 commit into from
Aug 24, 2026
Merged

Fix SSDs being registered as the wrong tier #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/resources/assets/opencomputers/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/opencomputers/lang/ru_ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-ой уровень)",
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/opencomputers/lang/uk_ua.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-й рівень)",
Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/li/cil/oc/common/init/OCItems.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


/////////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/li/cil/oc/common/item/SolidStateDrive.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -22,4 +22,4 @@ class SolidStateDrive(props: Properties, val tier: Int) extends Item(props) with
}
localizedName
}
}
}
Loading