Merge branch 'main' of https://github.com/Datapack-Hub/text

Author: HoodieRocks

src/lib/components/modals/CustomSourceModal.svelte

@@ -402,7 +402,7 @@
 			<Combobox
 				items={defaultAtlases}
 				type="single"
-				inputProps={{ placeholder: "Type an alias or use a default..." }}
+				inputProps={{ placeholder: "Defaults to minecraft:blocks" }}
 				bind:value={customValues.object.atlas} />
 			<p class="mt-2">Sprite</p>
 			<input

src/lib/components/modals/ExportModal.svelte

@@ -2,7 +2,7 @@
 	import Modal from "$lib/components/Modal.svelte";
 	import { outputVersion } from "$lib/stores";
 	import { translateMOTD } from "$lib/text/motd";
-	import { convert } from "$lib/text/nbt/nbt_or_json";
+	import { convert } from "$lib/text/nbt/export";
 	import IconCopy from "~icons/tabler/copy";
 	import CheckBox from "../CheckBox.svelte";
 	let {

src/lib/components/text/MiniEditor.svelte

@@ -10,14 +10,14 @@
 	import IconColor from "~icons/tabler/palette";
 	import IconSquare from "~icons/tabler/square-filled";
 	import IconHollow from "~icons/tabler/square-x";
-	import { convertToTextOrEmpty, snbtToDocument } from "../../text/nbt/nbt";
+	import { convertToTextOrEmpty, snbtToDocument } from "../../text/nbt/import";
 
 	import {
 		colorMap,
 		defaultColorLUT,
 		trueMarkOrUndefined,
 	} from "$lib/text/utils";
-	import { addTypeSpecificValues } from "$lib/text/nbt/nbt_or_json";
+	import { addTypeSpecificValues } from "$lib/text/nbt/export";
 	import {
 		FontsExtension,
 		Obfuscation,

src/lib/text/nbt/nbt_or_json.ts src/lib/text/nbt/export.tssrc/lib/text/nbt/nbt_or_json.ts renamed to src/lib/text/nbt/export.ts

@@ -67,7 +67,9 @@ export function addTypeSpecificValues(
 		case "atlas_object":
 			if (exportVersion.index >= 2) {
 				current.object = "atlas";
-				current.atlas = c.attrs?.atlas;
+				if(current.atlas) {
+					current.atlas = c.attrs?.atlas;	
+				}
 				current.sprite = c.attrs?.sprite;
 
 				current.bold = undefined;

src/lib/text/nbt/nbt.ts src/lib/text/nbt/import.tssrc/lib/text/nbt/nbt.ts renamed to src/lib/text/nbt/import.ts

@@ -44,7 +44,7 @@ export interface SelectorAttributes {
 }
 
 export interface AtlasObjectAttributes {
-	atlas: string;
+	atlas?: string;
 	sprite: string;
 }
 

src/lib/tiptap/extensions/index.ts

@@ -30,7 +30,10 @@ export const AtlasObjectNode = Node.create<NodeOptions>({
 	},
 
 	renderHTML({ HTMLAttributes, node }) {
-		const { atlas, sprite } = node.attrs;
+		let { atlas, sprite } = node.attrs;
+		if (!atlas) {
+			atlas = "minecraft:blocks"
+		}
 
 		return [
 			"span",

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

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { convert } from "$lib/text/nbt/nbt_or_json";
+	import { convert } from "$lib/text/nbt/export";
 
 	import {
 		AtlasObjectNode,
@@ -24,7 +24,7 @@
 	import MiniRenderer from "$lib/components/text/MiniRenderer.svelte";
 	import ColorPicker from "svelte-awesome-color-picker";
 
-	import { convertToTextOrEmpty, snbtToDocument } from "$lib/text/nbt/nbt";
+	import { convertToTextOrEmpty, snbtToDocument } from "$lib/text/nbt/import";
 	import { Editor, type JSONContent } from "@tiptap/core";
 	import Color from "@tiptap/extension-color";
 	import Placeholder from "@tiptap/extension-placeholder";

src/routes/+page.svelte

@@ -1,4 +1,4 @@
-import { convertToTextOrEmpty, snbtToDocument } from "$lib/text/nbt/nbt";
+import { convertToTextOrEmpty, snbtToDocument } from "../../lib/text/nbt/import";
 import { describe, expect, it } from "vitest";
 import { readTestDataFile, readTestJSONFile } from "./test_utils";
 

src/tests/unit/snbt_importing.spec.ts

@@ -1,7 +1,7 @@
 import {
 	addTypeSpecificValues,
 	translateJSON,
-} from "$lib/text/nbt/nbt_or_json";
+} from "$lib/text/nbt/export";
 import {
 	versions,
 	type MinecraftText,