Block entities use proper cubyz: ids (#2833)

Also adds markers

extracted from #2564

Author: IntegratedQuantum

assets/cubyz/blocks/chest/_defaults.zig.zon

@@ -6,7 +6,7 @@
 	},
 	.model = "cubyz:cube",
 	.rotation = "cubyz:planar",
-	.blockEntity = .chest,
+	.blockEntity = "cubyz:chest",
 	.onInteract = .{
 		.type = .openChest,
 	},

assets/cubyz/blocks/sign/_defaults.zig.zon

@@ -13,7 +13,7 @@
 		.ceiling = "cubyz:sign/ceiling",
 		.floor = "cubyz:sign/floor",
 	},
-	.blockEntity = .sign,
+	.blockEntity = "cubyz:sign",
 	.onInteract = .{
 		.type = .editSign,
 	},

src/block_entity.zig

@@ -27,7 +27,7 @@ const UpdateEvent = union(enum) {
 
 pub const ErrorSet = BinaryReader.AllErrors || error{Invalid};
 
-pub const BlockEntityType = struct {
+pub const BlockEntityType = struct { // MARK: BlockEntityType
 	id: []const u8,
 	vtable: VTable,
 
@@ -43,10 +43,10 @@ pub const BlockEntityType = struct {
 		getServerToClientData: *const fn (pos: Vec3i, chunk: *Chunk, writer: *BinaryWriter) void,
 		getClientToServerData: *const fn (pos: Vec3i, chunk: *Chunk, writer: *BinaryWriter) void,
 	};
-	pub fn init(comptime BlockEntityTypeT: type) BlockEntityType {
+	pub fn init(comptime BlockEntityTypeT: type, comptime id: []const u8) BlockEntityType {
 		BlockEntityTypeT.init();
 		var class = BlockEntityType{
-			.id = BlockEntityTypeT.id,
+			.id = id,
 			.vtable = undefined,
 		};
 
@@ -90,7 +90,7 @@ pub const BlockEntityType = struct {
 	}
 };
 
-fn BlockEntityDataStorage(T: type) type {
+fn BlockEntityDataStorage(T: type) type { // MARK: BlockEntityDataStorage
 	return struct {
 		pub const DataT = T;
 		var freeIndexList: main.ListUnmanaged(BlockEntityIndex) = .{};
@@ -181,14 +181,13 @@ fn BlockEntityDataStorage(T: type) type {
 	};
 }
 
-pub const BlockEntityTypes = struct {
-	pub const Chest = struct {
+pub const BlockEntityTypes = struct { // MARK: BlockEntityTypes
+	pub const @"cubyz:chest" = struct { // MARK: cubyz:chest
 		pub const inventorySize = 20;
 		const StorageServer = BlockEntityDataStorage(struct {
 			invId: main.items.Inventory.InventoryId,
 		});
 
-		pub const id = "chest";
 		pub fn init() void {
 			StorageServer.init();
 		}
@@ -249,8 +248,8 @@ pub const BlockEntityTypes = struct {
 		pub fn updateServerData(pos: Vec3i, chunk: *Chunk, event: UpdateEvent) ErrorSet!void {
 			switch (event) {
 				.remove => {
-					const chest = StorageServer.remove(pos, chunk) orelse return;
-					main.items.Inventory.ServerSide.destroyAndDropExternallyManagedInventory(chest.invId, pos);
+					const chestComponent = StorageServer.remove(pos, chunk) orelse return;
+					main.items.Inventory.ServerSide.destroyAndDropExternallyManagedInventory(chestComponent.invId, pos);
 				},
 				.update => |_| {
 					StorageServer.mutex.lock();
@@ -268,7 +267,7 @@ pub const BlockEntityTypes = struct {
 		pub fn renderAll(_: Mat4f, _: Vec3f, _: Vec3d) void {}
 	};
 
-	pub const Sign = struct {
+	pub const @"cubyz:sign" = struct { // MARK: cubyz:sign
 		const StorageServer = BlockEntityDataStorage(struct {
 			text: []const u8,
 		});
@@ -307,7 +306,6 @@ pub const BlockEntityTypes = struct {
 		const textureHeight = 72;
 		const textureMargin = 4;
 
-		pub const id = "sign";
 		pub fn init() void {
 			StorageServer.init();
 			StorageClient.init();
@@ -433,7 +431,7 @@ pub const BlockEntityTypes = struct {
 				const localPos = mesh.chunk.getLocalBlockPos(pos);
 				const block = mesh.chunk.data.getValue(localPos.toIndex());
 				const blockEntity = block.blockEntity() orelse return;
-				if (!std.mem.eql(u8, blockEntity.id, id)) return;
+				if (!std.mem.eql(u8, blockEntity.id, "cubyz:sign")) return;
 
 				StorageClient.mutex.lock();
 				defer StorageClient.mutex.unlock();
@@ -521,7 +519,7 @@ var blockyEntityTypes: std.StringHashMapUnmanaged(BlockEntityType) = .{};
 
 pub fn init() void {
 	inline for (@typeInfo(BlockEntityTypes).@"struct".decls) |declaration| {
-		const class = BlockEntityType.init(@field(BlockEntityTypes, declaration.name));
+		const class = BlockEntityType.init(@field(BlockEntityTypes, declaration.name), declaration.name);
 		blockyEntityTypes.putNoClobber(main.globalAllocator.allocator, class.id, class) catch unreachable;
 		std.log.debug("Registered BlockEntityType '{s}'", .{class.id});
 	}

src/callbacks/block/client/editSign.zig

@@ -11,13 +11,13 @@ pub fn init(_: ZonElement) ?*anyopaque {
 }
 
 pub fn run(_: *anyopaque, params: main.callbacks.ClientBlockCallback.Params) main.callbacks.Result {
-	if (params.block.blockEntity() == null or !std.mem.eql(u8, params.block.blockEntity().?.id, "sign")) {
+	if (params.block.blockEntity() == null or !std.mem.eql(u8, params.block.blockEntity().?.id, "cubyz:sign")) {
 		std.log.err("Can only edit sign if block entity of the block is a sign.", .{});
 		return .ignored;
 	}
-	main.block_entity.BlockEntityTypes.Sign.StorageClient.mutex.lock();
-	defer main.block_entity.BlockEntityTypes.Sign.StorageClient.mutex.unlock();
-	const data = main.block_entity.BlockEntityTypes.Sign.StorageClient.get(params.blockPos, params.chunk);
+	main.block_entity.BlockEntityTypes.@"cubyz:sign".StorageClient.mutex.lock();
+	defer main.block_entity.BlockEntityTypes.@"cubyz:sign".StorageClient.mutex.unlock();
+	const data = main.block_entity.BlockEntityTypes.@"cubyz:sign".StorageClient.get(params.blockPos, params.chunk);
 	main.gui.windowlist.sign_editor.openFromSignData(params.blockPos, if (data) |_data| _data.text else "");
 
 	return .handled;

src/callbacks/block/client/openChest.zig

@@ -11,13 +11,13 @@ pub fn init(_: ZonElement) ?*anyopaque {
 }
 
 pub fn run(_: *anyopaque, params: main.callbacks.ClientBlockCallback.Params) main.callbacks.Result {
-	if (params.block.blockEntity() == null or !std.mem.eql(u8, params.block.blockEntity().?.id, "chest")) {
+	if (params.block.blockEntity() == null or !std.mem.eql(u8, params.block.blockEntity().?.id, "cubyz:chest")) {
 		std.log.err("Can only open chest if block entity of the block is a chest.", .{});
 		return .ignored;
 	}
 	main.network.protocols.blockEntityUpdate.sendClientDataUpdateToServer(main.game.world.?.conn, params.blockPos);
 
-	const inventory = main.items.Inventory.ClientInventory.init(main.globalAllocator, main.block_entity.BlockEntityTypes.Chest.inventorySize, .serverShared, .{.blockInventory = params.blockPos}, .{});
+	const inventory = main.items.Inventory.ClientInventory.init(main.globalAllocator, main.block_entity.BlockEntityTypes.@"cubyz:chest".inventorySize, .serverShared, .{.blockInventory = params.blockPos}, .{});
 
 	main.gui.windowlist.chest.setInventory(inventory);
 	main.gui.openWindow("chest");

src/gui/windows/sign_editor.zig

@@ -44,7 +44,7 @@ fn apply() void {
 		return;
 	}
 
-	main.block_entity.BlockEntityTypes.Sign.updateTextFromClient(pos, textComponent.currentString.items);
+	main.block_entity.BlockEntityTypes.@"cubyz:sign".updateTextFromClient(pos, textComponent.currentString.items);
 
 	gui.toggleGameMenu();
 }