add player object type, and fix functions

Author: Silabear

src/lib/components/modals/CustomSourceModal.svelte

@@ -44,8 +44,14 @@
 			selector: "",
 		},
 		object: {
+			object: "",
 			atlas: "",
 			sprite: "",
+			player: {
+				name: "",
+				id:""
+			},
+			hat: true
 		},
 	});
 
@@ -383,6 +389,16 @@
 			Add Selector
 		</button>
 	{:else if customType === "object"}
+		<p class="mt-2">Object Type</p>
+		<select
+			bind:value={customValues.object.object}
+			class="rounded-md bg-zinc-900 p-2">
+			<option value="atlas">Atlas (sprite)</option>
+			<option value="player">Player Head</option>
+		</select>
+
+		
+		{#if customValues.object.object == "atlas"}
 		<p class="mt-2">Atlas</p>
 		<Combobox
 			items={defaultAtlases}
@@ -394,13 +410,14 @@
 			type="text"
 			class="rounded-md bg-zinc-900 p-2"
 			bind:value={customValues.object.sprite} />
+
 		<button
 			onclick={() => {
 				customDialog.close();
 				editor
 					.chain()
 					.focus()
-					.insertObject({
+					.insertAtlasObject({
 						atlas: customValues.object.atlas,
 						sprite: customValues.object.sprite,
 					})
@@ -409,5 +426,36 @@
 			class="mt-2 w-fit rounded-md bg-zinc-900 p-2 hover:bg-black/50">
 			Add Object
 		</button>
+		{:else if customValues.object.object == "player"}
+		<p class="mt-2">Username</p>
+		<input
+			type="text"
+			class="rounded-md bg-zinc-900 p-2"
+			bind:value={customValues.object.player.name} />
+
+		<div class="mt-2 flex items-center space-x-2">
+			<CheckBox bind:value={customValues.object.hat} label="interpret" />
+			<label for="interpret"
+				>Render Hat (2nd skin layer)</label>
+		</div>
+
+		<button
+			onclick={() => {
+				customDialog.close();
+				editor
+					.chain()
+					.focus()
+					.insertPlayerObject({
+						player: {
+							name: customValues.object.player.name
+						},
+						hat: customValues.object.hat
+					})
+					.run();
+			}}
+			class="mt-2 w-fit rounded-md bg-zinc-900 p-2 hover:bg-black/50">
+			Add Object
+		</button>
+		{/if}
 	{/if}
 </Modal>

src/lib/text/nbt_or_json.ts

@@ -79,8 +79,9 @@ export function addTypeSpecificValues(
 		case "keybind":
 			current.keybind = c.attrs?.key;
 			break;
-		case "object":
+		case "atlas_object":
 			if (exportVersion.index >= 2) {
+				current.object = "atlas"
 				current.atlas = c.attrs?.atlas;
 				current.sprite = c.attrs?.sprite;
 
@@ -90,6 +91,20 @@ export function addTypeSpecificValues(
 				current.text = ""
 			}
 			break;
+		case "player_object":
+			if (exportVersion.index >= 2) {
+				current.object = "player"
+				current.player = {
+					name: c.attrs?.player.name
+				}
+				current.hat = c.attrs?.hat;
+
+				current.bold = undefined;
+				current.italic = undefined;
+			} else {
+				current.text = ""
+			}
+			break;
 		case "selector":
 			current.selector = c.attrs?.selector;
 			break;
@@ -336,7 +351,6 @@ export function convert(
 ): string {
 	exportVersion = get(outputVersion)
 	let out = translateJSON(jsonContent, { exportType, optimise });
-	console.log(exportVersion)
 	if (exportVersion.index >= 1 && !force_json) {
 		// only remove strings
 		out = out.replace(/(?<=[{,]\s*)"[^"]*"\s*:/g, (match) =>

src/lib/tiptap/extensions/index.ts

@@ -43,11 +43,18 @@ export interface SelectorAttributes {
 	selector: string;
 }
 
-export interface ObjectAttributes {
+export interface AtlasObjectAttributes {
 	atlas: string;
 	sprite: string;
 }
 
+export interface PlayerObjectAttributes {
+	player: {
+		name: string;
+	};
+	hat?: boolean;
+}
+
 declare module "@tiptap/core" {
 	interface Commands<ReturnType> {
 		font: {
@@ -92,7 +99,8 @@ declare module "@tiptap/core" {
 			insertSelector: (attrs: SelectorAttributes) => ReturnType;
 		};
 		object: {
-			insertObject: (attrs: ObjectAttributes) => ReturnType;
+			insertAtlasObject: (attrs: AtlasObjectAttributes) => ReturnType;
+			insertPlayerObject: (attrs: PlayerObjectAttributes) => ReturnType;
 		};
 	}
 }
@@ -113,5 +121,6 @@ export { ScoreNode } from "./nodes/ScoreNode";
 export { SelectorNode } from "./nodes/SelectorNode";
 export { StorageNBTNode } from "./nodes/StorageNBTNode";
 export { TranslateNode } from "./nodes/TranslateNode";
-export { ObjectNode } from "./nodes/ObjectNode";
+export { AtlasObjectNode } from "./nodes/AtlasObjectNode";
+export { PlayerObjectNode } from "./nodes/PlayerObjectNode";
 export { FontsExtension } from "./fonts";

…ib/tiptap/extensions/nodes/ObjectNode.ts …ptap/extensions/nodes/AtlasObjectNode.tssrc/lib/tiptap/extensions/nodes/ObjectNode.ts renamed to src/lib/tiptap/extensions/nodes/AtlasObjectNode.ts src/lib/tiptap/extensions/nodes/ObjectNode.ts renamed to src/lib/tiptap/extensions/nodes/AtlasObjectNode.ts

@@ -1,8 +1,8 @@
 import { Node, mergeAttributes, type CommandProps } from "@tiptap/core";
-import type { NodeOptions, ObjectAttributes } from "../index";
+import type { NodeOptions, AtlasObjectAttributes } from "../index";
 
-export const ObjectNode = Node.create<NodeOptions>({
-	name: "object",
+export const AtlasObjectNode = Node.create<NodeOptions>({
+	name: "atlas_object",
 
 	inline: true,
 	group: "inline",
@@ -14,7 +14,7 @@ export const ObjectNode = Node.create<NodeOptions>({
 		};
 	},
 
-	addAttributes(): ObjectAttributes {
+	addAttributes(): AtlasObjectAttributes {
 		return {
 			atlas: "",
 			sprite: "",
@@ -24,7 +24,7 @@ export const ObjectNode = Node.create<NodeOptions>({
 	parseHTML() {
 		return [
 			{
-				tag: "span[data-object-node]",
+				tag: "span[data-atlas-object-node]",
 			},
 		];
 	},
@@ -35,7 +35,7 @@ export const ObjectNode = Node.create<NodeOptions>({
 		return [
 			"span",
 			mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
-				"data-object-node": "true",
+				"data-atlas-object-node": "true",
 				contenteditable: "false",
 				style: `
             background-color: #18181b;
@@ -53,7 +53,7 @@ export const ObjectNode = Node.create<NodeOptions>({
 
 	addCommands() {
 		return {
-			insertObject:
+			insertAtlasObject:
 				(attrs) =>
 				({ commands }: CommandProps) => {
 					return commands.insertContent({

src/lib/tiptap/extensions/nodes/PlayerObjectNode.ts

@@ -0,0 +1,68 @@
+import { Node, mergeAttributes, type CommandProps } from "@tiptap/core";
+import type { NodeOptions, PlayerObjectAttributes } from "../index";
+
+export const PlayerObjectNode = Node.create<NodeOptions>({
+	name: "player_object",
+
+	inline: true,
+	group: "inline",
+	atom: true,
+
+	addOptions() {
+		return {
+			HTMLAttributes: {},
+		};
+	},
+
+	addAttributes(): PlayerObjectAttributes {
+		return {
+			player: {
+				name: ""
+			},
+			hat: true
+		};
+	},
+
+	parseHTML() {
+		return [
+			{
+				tag: "span[data-player-object-node]",
+			},
+		];
+	},
+
+	renderHTML({ HTMLAttributes, node }) {
+		const { player, hat } = node.attrs;
+
+		return [
+			"span",
+			mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
+				"data-player-object-node": "true",
+				contenteditable: "false",
+				style: `
+            background-color: #18181b;
+            padding: 0px 5px;
+            border-radius: 4px;
+            font-size: 0.9rem;
+            display: inline-block;
+			vertical-align: var(--custom-source-align, middle);
+			text-decoration: inherit;
+        `,
+			}),
+			["span", {}, `OBJECT: [player ${player.name}]`],
+		];
+	},
+
+	addCommands() {
+		return {
+			insertPlayerObject:
+				(attrs) =>
+				({ commands }: CommandProps) => {
+					return commands.insertContent({
+						type: this.name,
+						attrs,
+					});
+				},
+		};
+	},
+});

src/lib/types.ts

@@ -54,8 +54,14 @@ export type MinecraftText = {
 	keybind?: string;
 
 	selector?: string;
+
+	object?: string
 	atlas?: string;
 	sprite?: string;
+	player?: {
+		name?: string;
+	};
+	hat?: string;
 
 	color?: string;
 	shadow_color?: number | number[];
@@ -127,8 +133,14 @@ export type ExternalSources = {
 		selector: string;
 	};
 	object: {
+		object: string;
 		atlas: string;
 		sprite: string;
+		player: {
+			name: string;
+			id: string;
+		};
+		hat: boolean;
 	};
 };