fix inconsistencies with object types

Author: HoodieRocks

src/app.css

@@ -21,23 +21,23 @@
 }
 
 /* Use MinecraftEnchantingBold if parent uses MinecraftEnchanting font */
-*[style*="font-family: MinecraftEnchanting"] strong,
-*[style*="font-family: 'MinecraftEnchanting'"] strong,
-*[style*='font-family: "MinecraftEnchanting"'] strong {
+*[style*="font-family: MinecraftEnchanting"] strong:not(:has([data-atlas-object-node],[data-player-object-node])),
+*[style*="font-family: 'MinecraftEnchanting'"] strong:not(:has([data-atlas-object-node],[data-player-object-node])),
+*[style*='font-family: "MinecraftEnchanting"'] strong:not(:has([data-atlas-object-node],[data-player-object-node])) {
 	font-family: MinecraftEnchantingBold;
 	font-weight: 100;
 }
 
 /* Use MinecraftIllagerBold if parent uses MinecraftIllager font */
-*[style*="font-family: MinecraftIllager"] strong,
-*[style*="font-family: 'MinecraftIllager'"] strong,
-*[style*='font-family: "MinecraftIllager"'] strong {
+*[style*="font-family: MinecraftIllager"] strong:not(:has([data-atlas-object-node],[data-player-object-node])),
+*[style*="font-family: 'MinecraftIllager'"] strong:not(:has([data-atlas-object-node],[data-player-object-node])),
+*[style*='font-family: "MinecraftIllager"'] strong:not(:has([data-atlas-object-node],[data-player-object-node])) {
 	font-family: MinecraftIllagerBold;
 	font-weight: 100;
 }
 
 /* Use MinecraftBold if not MinecraftEnchanting or MinecraftIllager */
-strong {
+strong:not(:has([data-atlas-object-node],[data-player-object-node])) {
 	font-family: MinecraftBold;
 	font-weight: 100;
 }
@@ -78,7 +78,7 @@ button {
 	--custom-source-align: top;
 }
 
-.obfuscated {
+.obfuscated:not(:has([data-atlas-object-node],[data-player-object-node])) {
 	filter: blur(2px);
 }
 

src/lib/components/modals/CustomSourceModal.svelte

@@ -396,7 +396,7 @@
 			<option value="player">Player Head</option>
 		</select>
 
-		{#if customValues.object.object || customValues.object.object == "atlas"}
+		{#if customValues.object.object == "atlas"}
 			<p class="mt-2">Atlas</p>
 			<Combobox
 				items={defaultAtlases}

src/lib/text/nbt/export.ts

@@ -73,6 +73,7 @@ export function addTypeSpecificValues(
 
 				current.bold = undefined;
 				current.italic = undefined;
+				current.obfuscated = undefined;
 			} else {
 				current.text = "";
 			}
@@ -87,6 +88,7 @@ export function addTypeSpecificValues(
 
 				current.bold = undefined;
 				current.italic = undefined;
+				current.obfuscated = undefined;
 			} else {
 				current.text = "";
 			}

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

@@ -1,5 +1,20 @@
-import { Node, mergeAttributes, type CommandProps } from "@tiptap/core";
-import type { NodeOptions, AtlasObjectAttributes } from "../index";
+import {
+	ClickEventMark,
+	FixedTextStyle,
+	FontsExtension,
+	HoverEventMark,
+	Obfuscation,
+	ShadowColorMark,
+} from "$lib/tiptap/extensions/index";
+import {
+	Node,
+	getSchema,
+	mergeAttributes,
+	type CommandProps,
+} from "@tiptap/core";
+import Color from "@tiptap/extension-color";
+import StarterKit from "@tiptap/starter-kit";
+import type { AtlasObjectAttributes, NodeOptions } from "../index";
 
 export const AtlasObjectNode = Node.create<NodeOptions>({
 	name: "atlas_object",
@@ -38,7 +53,7 @@ export const AtlasObjectNode = Node.create<NodeOptions>({
 		return [
 			"span",
 			mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
-				"data-atlas-object-node": "true",
+				"data-atlas-object-node": "",
 				contenteditable: "false",
 				style: `
             background-color: #18181b;
@@ -47,6 +62,8 @@ export const AtlasObjectNode = Node.create<NodeOptions>({
             font-size: 0.9rem;
             display: inline-block;
 			vertical-align: var(--custom-source-align, middle);
+			font-style: normal !important;
+			font-weight: normal !important;
 			text-decoration: inherit;
         `,
 			}),

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

@@ -37,7 +37,7 @@ export const PlayerObjectNode = Node.create<NodeOptions>({
 		return [
 			"span",
 			mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
-				"data-player-object-node": "true",
+				"data-player-object-node": "",
 				contenteditable: "false",
 				style: `
             background-color: #18181b;
@@ -46,6 +46,8 @@ export const PlayerObjectNode = Node.create<NodeOptions>({
             font-size: 0.9rem;
             display: inline-block;
 			vertical-align: var(--custom-source-align, middle);
+			font-style: normal !important;
+			font-weight: normal !important;
 			text-decoration: inherit;
         `,
 			}),