From de8413bad3c6fdf7ba3668b6ae1ef8979529f0b5 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Mon, 14 Aug 2023 05:03:45 +1000 Subject: Merge pull request #381 * round down in composter * Using NEUInternalName in MinionCraftHelper SkyHanniTestCommand --- .../skyhanni/features/garden/composter/ComposterOverlay.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index 41f370e6a..66c7b2c41 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -28,6 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.* import kotlin.math.ceil +import kotlin.math.floor import kotlin.time.Duration import kotlin.time.DurationUnit @@ -388,7 +389,16 @@ class ComposterOverlay { val item = NEUItems.getItemStack(internalName) val itemName = item.name!! val price = getPrice(internalName) - val itemsNeeded = ceil(missing / factor) + val itemsNeeded = if (config.composterRoundDown) { + val amount = missing / factor + if (amount > .75 && amount < 1.0) { + 1.0 + } else { + floor(amount) + } + } else { + ceil(missing / factor) + } val totalPrice = itemsNeeded * price val list = mutableListOf() -- cgit