tgpholly
/
mc-beta-server
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Make item collection work

This commit is contained in:
Holly Stubbs 2023-12-18 11:18:15 +00:00
parent dc05cd4a2d
commit f4733f50a3
Signed by: tgpholly
GPG Key ID: B8583C4B7D18119E
3 changed files with 93 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/inventories/ItemStack.ts
View File

@ -92,18 +92,19 @@ export class ItemStack {
public insert(itemStack:ItemStack) {
const remainingSpace = this.spaceAvaliable;
if (remainingSpace === 0) {
return;
return false;
}
if (remainingSpace >= itemStack.size) {
this.size += itemStack.size;
itemStack.size = 0;
return;
return true;
}
if (remainingSpace < itemStack.size) {
this.size += remainingSpace;
itemStack.size -= remainingSpace;
return true;
}
}

49
server/inventories/PlayerInventory.ts
View File

@ -1,4 +1,6 @@
import { Player } from "../entities/Player";
import { PacketSetSlot } from "../packets/SetSlot";
import { PacketWindowItems } from "../packets/WindowItems";
import { Inventory } from "./Inventory";
import { ItemStack } from "./ItemStack";
@ -11,64 +13,95 @@ export default class PlayerInventory extends Inventory {
this.player = player;
}
sendUpdatedStacks(stackIdsChanged:Array<number>) {
let updateBuffer = Buffer.alloc(0);
for (const slotId of stackIdsChanged) {
const slotItem = this.itemStacks[slotId];
let buffer:Buffer;
if (slotItem == null) {
buffer = new PacketSetSlot(0, slotId, -1).writeData();
} else {
buffer = new PacketSetSlot(0, slotId, slotItem.itemID, slotItem.size, slotItem.damage).writeData();
}
updateBuffer = Buffer.concat([updateBuffer, buffer], updateBuffer.length + buffer.length);
}
if (updateBuffer.length > 0) {
this.player.mpClient?.send(updateBuffer);
}
}
addItemStack(itemStack:ItemStack) {
const itemStacksOfSameType:Array<ItemStack> = new Array<ItemStack>();
const itemStackIds:Array<number> = new Array<number>();
const stackIdsChanged:Array<number> = new Array<number>();
// Check bottom inventory row (hotbar) first.
let workingItemStack:ItemStack | null;
for (let slotId = 36; slotId <= 44; slotId++) {
if ((workingItemStack = this.itemStacks[slotId]) != null) {
itemStacksOfSameType.push(workingItemStack);
itemStackIds.push(slotId);
}
}
for (let slotId = 9; slotId <= 35; slotId++) {
if ((workingItemStack = this.itemStacks[slotId]) != null) {
itemStacksOfSameType.push(workingItemStack);
itemStackIds.push(slotId);
}
}
// Insert into existing stacks first.
for (const inventoryItemStack of itemStacksOfSameType) {
for (let i = 0; i < itemStacksOfSameType.length; i++) {
const inventoryItemStack = itemStacksOfSameType[i];
// Exit early if we have nothing left
if (itemStack.size === 0) {
return;
return this.sendUpdatedStacks(stackIdsChanged);
}
if (inventoryItemStack.itemID !== itemStack.itemID || inventoryItemStack.damage !== itemStack.damage) {
continue;
}
inventoryItemStack.insert(itemStack);
if (inventoryItemStack.insert(itemStack)) {
stackIdsChanged.push(itemStackIds[i]);
}
}
// Exit early if we have nothing left
if (itemStack.size === 0) {
return;
return this.sendUpdatedStacks(stackIdsChanged);
}
for (let slotId = 36; slotId <= 44; slotId++) {
// Exit early if we have nothing left
if (itemStack.size === 0) {
return;
return this.sendUpdatedStacks(stackIdsChanged);
}
if ((workingItemStack = this.itemStacks[slotId]) == null) {
const stack = this.itemStacks[slotId] = new ItemStack(itemStack.itemID, 0, itemStack.damage);
stack.insert(itemStack);
if (stack.insert(itemStack)) {
stackIdsChanged.push(slotId);
}
}
}
for (let slotId = 9; slotId <= 35; slotId++) {
// Exit early if we have nothing left
if (itemStack.size === 0) {
return;
return this.sendUpdatedStacks(stackIdsChanged);
}
if ((workingItemStack = this.itemStacks[slotId]) == null) {
const stack = this.itemStacks[slotId] = new ItemStack(itemStack.itemID, 0, itemStack.damage);
stack.insert(itemStack);
if (stack.insert(itemStack)) {
stackIdsChanged.push(slotId);
}
}
}
this.sendUpdatedStacks(stackIdsChanged)
}
}

49
server/packets/SetSlot.ts Normal file
View File

@ -0,0 +1,49 @@
import { createWriter, IReader, Endian } from "bufferstuff";
import { IPacket } from "./IPacket";
import { Packet } from "../enums/Packet";
export class PacketSetSlot implements IPacket {
public packetId = Packet.SetSlot;
public windowId:number;
public slot:number;
public itemId:number;
public itemCount:number;
public itemUses:number;
public constructor(windowId?:number, slot?:number, itemId?:number, itemCount?:number, itemUses?:number) {
if (typeof(windowId) === "number" && typeof(slot) === "number" && typeof(itemId) === "number" && typeof(itemCount) === "number" && typeof(itemUses) === "number") {
this.windowId = windowId;
this.slot = slot;
this.itemId = itemId;
this.itemCount = itemCount;
this.itemUses = itemUses;
} else {
this.windowId = Number.MIN_VALUE;
this.slot = Number.MIN_VALUE;
this.itemId = Number.MIN_VALUE;
this.itemCount = Number.MIN_VALUE;
this.itemUses = Number.MIN_VALUE;
}
}
public readData(reader:IReader) {
this.windowId = reader.readByte();
this.slot = reader.readShort();
this.itemId = reader.readShort();
if (this.itemId !== -1) {
this.itemCount = reader.readByte();
this.itemUses = reader.readShort();
}
return this;
}
public writeData() {
const writer = createWriter(Endian.BE, this.itemId === -1 ? 6 : 9).writeUByte(this.packetId).writeByte(this.windowId).writeShort(this.slot).writeShort(this.itemId);
if (this.itemId !== -1) {
writer.writeByte(this.itemCount);
writer.writeShort(this.itemUses);
}
return writer.toBuffer();
}
}