Skip to content

Commit 51544a7

Browse files
Fix FurnaceGenerator burning entire item stack
1 parent e5adb9e commit 51544a7

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/tileentity/energy/FurnaceGenerator.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import xyz.xenondevs.nova.util.PacketTask
2525
import xyz.xenondevs.nova.util.advance
2626
import xyz.xenondevs.nova.util.axis
2727
import xyz.xenondevs.nova.util.item.craftingRemainingItem
28+
import xyz.xenondevs.nova.util.item.isNotNullOrEmpty
2829
import xyz.xenondevs.nova.util.particle.particle
2930
import xyz.xenondevs.nova.world.BlockPos
3031
import xyz.xenondevs.nova.world.block.state.NovaBlockState
@@ -121,12 +122,12 @@ class FurnaceGenerator(pos: BlockPos, blockState: NovaBlockState, data: Compound
121122
val fuelStack = inventory.getItem(0)
122123
if (energyHolder.energy < energyHolder.maxEnergy && fuelStack != null) {
123124
val itemBurnTime = Fuel.getBurnTime(fuelStack)
124-
if (itemBurnTime != null) {
125+
if (itemBurnTime > 0) {
125126
rawBurnTime.set(itemBurnTime)
126127
currentBurnTime = 0
127128

128129
val remains = fuelStack.craftingRemainingItem
129-
if (remains != null) {
130+
if (remains.isNotNullOrEmpty()) {
130131
inventory.setItem(null, 0, remains)
131132
} else inventory.addItemAmount(null, 0, -1)
132133
}

machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/tileentity/processing/AutoCrafter.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import xyz.xenondevs.nova.ui.menu.item.BackItem
2828
import xyz.xenondevs.nova.ui.menu.sideconfig.OpenSideConfigItem
2929
import xyz.xenondevs.nova.ui.menu.sideconfig.SideConfigMenu
3030
import xyz.xenondevs.nova.util.item.craftingRemainingItem
31+
import xyz.xenondevs.nova.util.item.isNotNullOrEmpty
3132
import xyz.xenondevs.nova.util.playClickSound
3233
import xyz.xenondevs.nova.world.BlockPos
3334
import xyz.xenondevs.nova.world.block.state.NovaBlockState
@@ -148,8 +149,8 @@ class AutoCrafter(pos: BlockPos, blockState: NovaBlockState, data: Compound) : N
148149
val resultItems = ArrayList<ItemStack>()
149150
for (i in 0..<9) {
150151
val remaining = inputInv.getItem(i)?.craftingRemainingItem
151-
if (remaining != null)
152-
resultItems += remaining
152+
if (remaining.isNotNullOrEmpty())
153+
resultItems += remaining!!
153154
}
154155
return resultItems
155156
}

0 commit comments

Comments
 (0)