mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-21 23:58:53 -05:00
TM Machine GUI and Inventory synced and working properly
This commit is contained in:
1 parent
a3f272b2aa
commit
ab0a129ba1
6 files changed
+62
-78
No files matched your search
@@ -46,6 +46,7 @@ import net.minecraft.world.phys.shapes.Shapes
|
||||
import net.minecraft.world.phys.shapes.VoxelShape
|
||||
import net.minecraft.server.level.ServerLevel
|
||||
import net.minecraft.sounds.SoundSource
|
||||
import net.minecraft.world.Containers
|
||||
import net.minecraft.world.entity.player.Player
|
||||
import net.minecraft.world.item.context.BlockPlaceContext
|
||||
|
||||
@@ -154,4 +155,15 @@ class TMBlock(properties: BlockBehaviour.Properties) : BaseEntityBlock(propertie
|
||||
else -> Shapes.empty()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onRemove(
|
||||
state: BlockState,
|
||||
level: Level,
|
||||
pos: BlockPos,
|
||||
newState: BlockState,
|
||||
movedByPiston: Boolean
|
||||
) {
|
||||
Containers.dropContentsOnDestroy(state, newState, level, pos)
|
||||
super.onRemove(state, level, pos, newState, movedByPiston)
|
||||
}
|
||||
}
|
||||
@@ -46,18 +46,18 @@ class TMBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlockEntity
|
||||
}
|
||||
|
||||
override fun createMenu(containerId: Int, inventory: Inventory): AbstractContainerMenu {
|
||||
return CobblemonMenuHandlers.TMM_SCREEN.create(containerId, inventory)
|
||||
return TMMScreenHandler(containerId, inventory, this.tmmInventory, this)
|
||||
}
|
||||
|
||||
override fun saveAdditional(compound: CompoundTag, registries: HolderLookup.Provider) {
|
||||
super.saveAdditional(compound, registries)
|
||||
ContainerHelper.saveAllItems(compound, tmmInventory.itemsList, registries)
|
||||
ContainerHelper.saveAllItems(compound, tmmInventory.items, registries)
|
||||
tmmInventory.filterTM?.let { compound.putString(FILTER_TM_NBT, it.name) }
|
||||
}
|
||||
|
||||
override fun loadAdditional(compound: CompoundTag, registries: HolderLookup.Provider) {
|
||||
super.loadAdditional(compound, registries)
|
||||
ContainerHelper.loadAllItems(compound, tmmInventory.itemsList, registries)
|
||||
ContainerHelper.loadAllItems(compound, tmmInventory.items, registries)
|
||||
tmmInventory.filterTM = compound.getString(FILTER_TM_NBT)?.let { Moves.getByName(it) }
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ class TMBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlockEntity
|
||||
}
|
||||
|
||||
override fun getItems(): NonNullList<ItemStack> {
|
||||
return tmmInventory.itemsList
|
||||
return tmmInventory.items
|
||||
}
|
||||
|
||||
override fun setItems(items: NonNullList<ItemStack>) {
|
||||
@@ -125,14 +125,8 @@ class TMBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlockEntity
|
||||
}
|
||||
|
||||
class TMBlockInventory(val blockEntity: TMBlockEntity) : SimpleContainer(4) {
|
||||
val itemsList: NonNullList<ItemStack> = NonNullList.withSize(4, ItemStack.EMPTY)
|
||||
|
||||
var filterTM: MoveTemplate? = null
|
||||
|
||||
fun getInventoryItems(): NonNullList<ItemStack> {
|
||||
return itemsList
|
||||
}
|
||||
|
||||
override fun canPlaceItem(slot: Int, stack: ItemStack): Boolean {
|
||||
val blockState = blockEntity.blockState
|
||||
if (blockState.getValue(TMBlock.ON)) return false
|
||||
|
||||
@@ -547,14 +547,14 @@ class TMMHandledScreen(
|
||||
small = false,
|
||||
onPress = {
|
||||
inventory.player.playSound(CobblemonSounds.GUI_CLICK, 1f, 1f)
|
||||
val currentTm = selectedTM ?: return@EjectButton CobblemonNetwork.sendToServer(CraftBlankTMPacket(handler.input.getItem(2)))
|
||||
val currentTm = selectedTM ?: return@EjectButton CobblemonNetwork.sendToServer(CraftBlankTMPacket(handler.inventory!!.getItem(2)))
|
||||
|
||||
CobblemonNetwork.sendToServer(
|
||||
CraftTMPacket(
|
||||
currentTm,
|
||||
handler.input.getItem(0),
|
||||
handler.input.getItem(1),
|
||||
handler.input.getItem(2)
|
||||
handler.inventory!!.getItem(0),
|
||||
handler.inventory!!.getItem(1),
|
||||
handler.inventory!!.getItem(2)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
+4
-3
@@ -22,13 +22,14 @@ import net.minecraft.world.item.Items
|
||||
object CraftBlankTMPacketHandler : ServerNetworkPacketHandler<CraftBlankTMPacket> {
|
||||
override fun handle(packet: CraftBlankTMPacket, server: MinecraftServer, player: ServerPlayer) {
|
||||
val screen = player.containerMenu as TMMScreenHandler
|
||||
val ingredientSlot = screen.input.getItem(2)
|
||||
if (screen.inventory == null) return
|
||||
val ingredientSlot = screen.inventory!!.getItem(2)
|
||||
|
||||
if (ingredientSlot.`is`(Items.AMETHYST_SHARD) && ingredientSlot.count >= 1) {
|
||||
screen.input.removeItem(2, 1)
|
||||
screen.inventory!!.removeItem(2, 1)
|
||||
screen.result.setItem(0, CobblemonItems.BLANK_TM.defaultInstance)
|
||||
|
||||
screen.input.setChanged()
|
||||
screen.inventory!!.setChanged()
|
||||
screen.result.setChanged()
|
||||
player.containerMenu.broadcastChanges()
|
||||
|
||||
|
||||
+11
-10
@@ -27,9 +27,10 @@ import net.minecraft.world.item.ItemStack
|
||||
object CraftTMPacketHandler : ServerNetworkPacketHandler<CraftTMPacket> {
|
||||
override fun handle(packet: CraftTMPacket, server: MinecraftServer, player: ServerPlayer) {
|
||||
val screen = player.containerMenu as TMMScreenHandler
|
||||
val discSlot = screen.input.getItem(0)
|
||||
val gemSlot = screen.input.getItem(1)
|
||||
val ingredientSlot = screen.input.getItem(2)
|
||||
if (screen.inventory == null) return
|
||||
val discSlot = screen.inventory!!.getItem(0)
|
||||
val gemSlot = screen.inventory!!.getItem(1)
|
||||
val ingredientSlot = screen.inventory!!.getItem(2)
|
||||
val outputSlot = screen.result.getItem(0)
|
||||
val typeGem = player.serverLevel().itemRegistry.get(ElementalTypes.get(packet.tm.type)?.typeGem)
|
||||
|
||||
@@ -37,15 +38,15 @@ object CraftTMPacketHandler : ServerNetworkPacketHandler<CraftTMPacket> {
|
||||
return
|
||||
}
|
||||
|
||||
if (discSlot != null && discSlot.item != CobblemonItems.BLANK_TM) {
|
||||
if (discSlot.item != CobblemonItems.BLANK_TM) {
|
||||
return
|
||||
}
|
||||
|
||||
if (gemSlot != null && gemSlot.item != typeGem) {
|
||||
if (gemSlot.item != typeGem) {
|
||||
return
|
||||
}
|
||||
|
||||
if (packet.tm.recipe != null && ingredientSlot != null) {
|
||||
if (packet.tm.recipe != null) {
|
||||
if (!player.serverLevel().itemRegistry.get(packet.tm.recipe.item)?.let { ingredientSlot.`is`(it) }!! || ingredientSlot.count < packet.tm.recipe.count) {
|
||||
return
|
||||
}
|
||||
@@ -55,13 +56,13 @@ object CraftTMPacketHandler : ServerNetworkPacketHandler<CraftTMPacket> {
|
||||
val moveTemplate = packet.tm.moveName
|
||||
TMMoveComponent.setTMMove(stack, moveTemplate)
|
||||
screen.result.setItem(0, stack)
|
||||
screen.input.getItem(0).shrink(1)
|
||||
screen.input.getItem(1).shrink(1)
|
||||
screen.inventory!!.getItem(0).shrink(1)
|
||||
screen.inventory!!.getItem(1).shrink(1)
|
||||
if (packet.tm.recipe != null) {
|
||||
screen.input.getItem(2).shrink(packet.tm.recipe.count)
|
||||
screen.inventory!!.getItem(2).shrink(packet.tm.recipe.count)
|
||||
}
|
||||
|
||||
screen.input.setChanged()
|
||||
screen.inventory!!.setChanged()
|
||||
screen.result.setChanged()
|
||||
player.containerMenu.broadcastChanges()
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.gui
|
||||
|
||||
import com.cobblemon.mod.common.CobblemonItems
|
||||
import com.cobblemon.mod.common.block.entity.TMBlockEntity
|
||||
import net.minecraft.server.level.ServerPlayer
|
||||
import net.minecraft.world.Container
|
||||
import net.minecraft.world.SimpleContainer
|
||||
import net.minecraft.world.entity.player.Inventory
|
||||
@@ -19,7 +20,6 @@ import net.minecraft.world.item.ItemStack
|
||||
|
||||
class TMMScreenHandler(menuType: MenuType<*>, syncId: Int) : AbstractContainerMenu(menuType, syncId) {
|
||||
var playerInventory: Inventory? = null
|
||||
val input = TMMCraftingContainer(this, 3, 1)
|
||||
val result = ResultContainer()
|
||||
private var tmmEntity: TMBlockEntity? = null
|
||||
var inventory: Container? = null
|
||||
@@ -43,18 +43,19 @@ class TMMScreenHandler(menuType: MenuType<*>, syncId: Int) : AbstractContainerMe
|
||||
this.addSlot(Slot(playerInventory, col, startX + (slotWidth * col), startY + 58))
|
||||
}
|
||||
|
||||
this.addSlot(Slot(input, 0, startX + 167, startY + 9)) // Input slot 1
|
||||
this.addSlot(Slot(input, 1, startX + 185, startY + 9)) // Input slot 2
|
||||
this.addSlot(Slot(input, 2, startX + 203, startY + 9)) // Input slot 3
|
||||
this.addSlot(Slot(inventory, 0, startX + 167, startY + 9)) // Input slot 1
|
||||
this.addSlot(Slot(inventory, 1, startX + 185, startY + 9)) // Input slot 2
|
||||
this.addSlot(Slot(inventory, 2, startX + 203, startY + 9)) // Input slot 3
|
||||
|
||||
this.addSlot(ResultSlot(
|
||||
playerInventory.player,
|
||||
input,
|
||||
result,
|
||||
0,
|
||||
startX + 123,
|
||||
startY - 22
|
||||
))
|
||||
this.addSlot(TMResultSlot(result, 0, startX + 123, startY - 22))
|
||||
//this.addSlot(ResultSlot(
|
||||
// playerInventory.player,
|
||||
// input,
|
||||
// result,
|
||||
// 0,
|
||||
// startX + 123,
|
||||
// startY - 22
|
||||
//))
|
||||
}
|
||||
|
||||
fun getTMEntity(): TMBlockEntity? {
|
||||
@@ -83,54 +84,29 @@ class TMMScreenHandler(menuType: MenuType<*>, syncId: Int) : AbstractContainerMe
|
||||
}*/
|
||||
|
||||
override fun removed(player: Player) {
|
||||
val resultItem = result.getItem(0)
|
||||
if (!resultItem.isEmpty) { //Ensure player result item is given to player or dropped on
|
||||
if (player.isAlive && (player as? ServerPlayer)?.hasDisconnected() != true) {
|
||||
player.inventory.placeItemBackInInventory(resultItem)
|
||||
}
|
||||
else {
|
||||
player.drop(resultItem, false)
|
||||
}
|
||||
}
|
||||
|
||||
super.removed(player)
|
||||
tmmEntity?.level?.setBlock(tmmEntity!!.blockPos, tmmEntity!!.blockState, 3)
|
||||
}
|
||||
|
||||
fun syncState() {
|
||||
// Synchronize the input container slots
|
||||
val tmInventory = inventory ?: return
|
||||
for (i in 0 until input.containerSize) {
|
||||
input.setItem(i, tmInventory.getItem(i))
|
||||
}
|
||||
|
||||
// Synchronize the result slot if there's a valid TM or blank TM
|
||||
if (!tmInventory.getItem(3).isEmpty) {
|
||||
if (ItemStack.isSameItemSameComponents(tmInventory.getItem(3), CobblemonItems.TECHNICAL_MACHINE.defaultInstance) ||
|
||||
ItemStack.isSameItemSameComponents(tmInventory.getItem(3), CobblemonItems.BLANK_TM.defaultInstance)
|
||||
) {
|
||||
result.setItem(0, tmInventory.getItem(3))
|
||||
}
|
||||
} else {
|
||||
tmInventory.setItem(3, result.getItem(0))
|
||||
}
|
||||
|
||||
|
||||
// Notify the client and server of changes
|
||||
broadcastChanges()
|
||||
}
|
||||
|
||||
|
||||
override fun broadcastChanges() {
|
||||
if (inventory is TMBlockEntity.TMBlockInventory) {
|
||||
input.setItem(0, (inventory as TMBlockEntity.TMBlockInventory).itemsList[0])
|
||||
input.setItem(1, (inventory as TMBlockEntity.TMBlockInventory).itemsList[1])
|
||||
input.setItem(2, (inventory as TMBlockEntity.TMBlockInventory).itemsList[2])
|
||||
|
||||
if ((inventory as TMBlockEntity.TMBlockInventory).itemsList[3] != ItemStack.EMPTY) {
|
||||
if (ItemStack.isSameItemSameComponents((inventory as TMBlockEntity.TMBlockInventory).itemsList[3], CobblemonItems.TECHNICAL_MACHINE.defaultInstance) ||
|
||||
ItemStack.isSameItemSameComponents((inventory as TMBlockEntity.TMBlockInventory).itemsList[3], CobblemonItems.BLANK_TM.defaultInstance)) {
|
||||
result.setItem(0, (inventory as TMBlockEntity.TMBlockInventory).itemsList[3])
|
||||
}
|
||||
} else {
|
||||
(inventory as TMBlockEntity.TMBlockInventory).itemsList[3] = result.getItem(0)
|
||||
}
|
||||
}
|
||||
|
||||
super.broadcastChanges()
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val SLOT_COUNT = 3
|
||||
}
|
||||
|
||||
class TMResultSlot(container: Container, slot: Int, x: Int, y: Int) : Slot(container, slot, x, y) {
|
||||
override fun mayPlace(stack: ItemStack): Boolean { return false }
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user