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

Fix being unable to drain sub 1-xp point liquid xp

Browse Source
This commit is contained in:
DBotThePony 2025-03-29 14:11:17 +07:00
parent 640aeabb07
commit f82c7977fa
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt
View File

@ -117,6 +117,10 @@ class ExperienceStorage(val maxExperience: DoubleSupplier = DoubleSupplier { Dou
experience = (nbt?.asDouble ?: 0.0).coerceAtLeast(0.0) experience = (nbt?.asDouble ?: 0.0).coerceAtLeast(0.0)
} }
private val liquidXPMilliBuckets: Int get() {
return (experience * XP_TO_LIQUID_RATIO).toInt()
}
override fun getTanks(): Int { override fun getTanks(): Int {
return 1 return 1
} }
@ -125,7 +129,7 @@ class ExperienceStorage(val maxExperience: DoubleSupplier = DoubleSupplier { Dou
if (tank != 0) if (tank != 0)
return FluidStack.EMPTY return FluidStack.EMPTY
return FluidStack(MFluids.LIQUID_XP, (experience * XP_TO_LIQUID_RATIO).toInt()) return FluidStack(MFluids.LIQUID_XP, liquidXPMilliBuckets)
} }
override fun getTankCapacity(tank: Int): Int { override fun getTankCapacity(tank: Int): Int {
@ -148,13 +152,13 @@ class ExperienceStorage(val maxExperience: DoubleSupplier = DoubleSupplier { Dou
} }
override fun drain(maxDrain: Int, action: IFluidHandler.FluidAction): FluidStack { override fun drain(maxDrain: Int, action: IFluidHandler.FluidAction): FluidStack {
val actualDrain = maxDrain.coerceAtMost((experience * XP_TO_LIQUID_RATIO).toInt()).let { it / XP_TO_LIQUID_RATIO * XP_TO_LIQUID_RATIO } val actualDrain = maxDrain.coerceAtMost(liquidXPMilliBuckets)
if (actualDrain <= 0) if (actualDrain <= 0)
return FluidStack.EMPTY return FluidStack.EMPTY
if (action.execute()) if (action.execute())
experience -= actualDrain / XP_TO_LIQUID_RATIO experience -= actualDrain.toDouble() / XP_TO_LIQUID_RATIO
return FluidStack(MFluids.LIQUID_XP, actualDrain) return FluidStack(MFluids.LIQUID_XP, actualDrain)
} }