DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Fix matter capacitor and matter dust having "no" matter value

Browse Source
This commit is contained in:
DBotThePony 2022-11-24 16:45:40 +07:00
parent 10b2df4c48
commit 8f675a8a02
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt
View File

@ -25,7 +25,7 @@ class MatterDustItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CREAT
override fun getMatterValue(stack: ItemStack): IMatterValue? { override fun getMatterValue(stack: ItemStack): IMatterValue? {
val value = stack.tag?.get("matter") ?: return null val value = stack.tag?.get("matter") ?: return null
return MatterValue(ImpreciseFraction.deserializeNBT(value), 0.0) return MatterValue(ImpreciseFraction.deserializeNBT(value), 1.0)
} }
override fun canDecompose(stack: ItemStack) = false override fun canDecompose(stack: ItemStack) = false

1
src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterItem.kt
View File

@ -4,6 +4,5 @@ import net.minecraft.world.item.ItemStack
interface IMatterItem { interface IMatterItem {
fun getMatterValue(stack: ItemStack): IMatterValue? fun getMatterValue(stack: ItemStack): IMatterValue?
fun hasMatterValue(stack: ItemStack) = getMatterValue(stack) != null
fun canDecompose(stack: ItemStack): Boolean fun canDecompose(stack: ItemStack): Boolean
} }

2
src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt
View File

@ -997,7 +997,7 @@ object MatterManager {
val matterCap = value.getCapability(MatteryCapability.MATTER).orNull() val matterCap = value.getCapability(MatteryCapability.MATTER).orNull()
if (matterCap != null) { if (matterCap != null) {
matter = MatterValue(matter.matter + matterCap.storedMatter, matter.complexity) matter = MatterValue(matter.matter + matterCap.storedMatter, matter.complexity.coerceAtLeast(1.0))
undamagedMatterValue = MatterValue(undamagedMatterValue.matter + matterCap.storedMatter, undamagedMatterValue.complexity) undamagedMatterValue = MatterValue(undamagedMatterValue.matter + matterCap.storedMatter, undamagedMatterValue.complexity)
} }