Compare commits
3 Commits
7447c89394
...
46e00cea97
Author | SHA1 | Date |
---|---|---|
Shadowfacts | 46e00cea97 | |
Shadowfacts | ce511e62e1 | |
Shadowfacts | 5eb948802c |
|
@ -205,7 +205,7 @@ abstract class AbstractTerminalScreenHandler<T: AbstractTerminalBlockEntity>(
|
|||
} else if (isPlayerSlot(slotId)) {
|
||||
val slotsInsertedInto = tryInsertItem(slot.stack, bufferSlotsStart until playerSlotsStart) { terminal.internalBuffer.getMode(it - bufferSlotsStart) != TerminalBufferInventory.Mode.FROM_NETWORK }
|
||||
slotsInsertedInto.forEach { terminal.internalBuffer.markSlot(it - bufferSlotsStart, TerminalBufferInventory.Mode.TO_NETWORK) }
|
||||
if (slot.stack.isEmpty) {
|
||||
if (slotsInsertedInto.isEmpty()) {
|
||||
return ItemStack.EMPTY
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package net.shadowfacts.phycon.block.terminal
|
||||
|
||||
import alexiil.mc.lib.attributes.item.ItemStackCollections
|
||||
import net.minecraft.entity.player.PlayerEntity
|
||||
import net.minecraft.entity.player.PlayerInventory
|
||||
import net.minecraft.inventory.CraftingInventory
|
||||
import net.minecraft.inventory.CraftingResultInventory
|
||||
|
@ -94,6 +94,36 @@ class CraftingTerminalScreenHandler(
|
|||
terminal.requestItemsForCrafting(maxAmount)
|
||||
}
|
||||
|
||||
override fun transferSlot(player: PlayerEntity, slotId: Int): ItemStack {
|
||||
if (slotId == resultSlot.id && resultSlot.hasStack()) {
|
||||
val craftingResult = resultSlot.stack
|
||||
val originalResult = craftingResult.copy()
|
||||
|
||||
// todo: CraftingScreenHandler calls onCraft, but I don't think that's necessary because onStackChanged should handle it
|
||||
craftingResult.item.onCraft(craftingResult, player.world, player)
|
||||
|
||||
if (!insertItem(craftingResult, playerSlotsStart, playerSlotsEnd, true)) {
|
||||
return ItemStack.EMPTY
|
||||
}
|
||||
resultSlot.onStackChanged(craftingResult, originalResult)
|
||||
|
||||
if (craftingResult.isEmpty) {
|
||||
resultSlot.stack = ItemStack.EMPTY
|
||||
}
|
||||
|
||||
if (craftingResult.count == originalResult.count) {
|
||||
return ItemStack.EMPTY
|
||||
}
|
||||
|
||||
val taken = resultSlot.onTakeItem(player, craftingResult)
|
||||
player.dropItem(taken, false)
|
||||
|
||||
return originalResult
|
||||
} else {
|
||||
return super.transferSlot(player, slotId)
|
||||
}
|
||||
}
|
||||
|
||||
// RecipeType.CRAFTING wants a CraftingInventory, but we can't store a CraftingInventory on the BE without a screen handler, so...
|
||||
class CraftingInv(val handler: CraftingTerminalScreenHandler): CraftingInventory(handler, 3, 3) {
|
||||
private val backing = handler.terminal.craftingInv
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "phycon:crafting_terminal"
|
||||
}
|
||||
],
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
Loading…
Reference in New Issue