{#each fontLUT as [identifier, _]}
-
+
+
+
+
{/each}
+
{#if editor.isActive("shadowColor")}
{:else}
-
-
- editor.chain().focus().setShadowColor(shadowColorValue).run()} />
+
{/if}
+
+
c.value)}
+ label="" />
+
\ No newline at end of file
diff --git a/src/lib/text/motd.ts b/src/lib/text/motd.ts
index d9a1e04..aea41ec 100644
--- a/src/lib/text/motd.ts
+++ b/src/lib/text/motd.ts
@@ -1,5 +1,5 @@
import type { JSONContent } from "@tiptap/core";
-import { colorMap, trueMarkOrUndefined, unescapeUnicode } from "./general";
+import { colorMap, trueMarkOrUndefined, unescapeUnicode } from "./utils";
function hexToRgb(hex: string): [number, number, number] {
hex = hex.replace(/^#/, "");
diff --git a/src/lib/text/nbt.ts b/src/lib/text/nbt/nbt.ts
similarity index 78%
rename from src/lib/text/nbt.ts
rename to src/lib/text/nbt/nbt.ts
index bdeadf5..12ce4b9 100644
--- a/src/lib/text/nbt.ts
+++ b/src/lib/text/nbt/nbt.ts
@@ -1,7 +1,7 @@
import type { JSONContent } from "@tiptap/core";
-import { defaultColorReverseLUT } from "./general";
-import { type MinecraftText, type OldMinecraftText } from "../types";
-import { type StringyMCText } from "../types";
+import { defaultColorReverseLUT } from "../utils";
+import { type MinecraftText, type OldMinecraftText } from "../../types";
+import { type StringyMCText } from "../../types";
export function snbtToDocument(raw: StringyMCText[]): JSONContent {
let baseDocument: JSONContent = {
@@ -30,8 +30,16 @@ export function snbtToDocument(raw: StringyMCText[]): JSONContent {
export function convertToTextOrEmpty(raw: string): StringyMCText[] {
if (raw === "") return [];
- raw = raw.replace(/([,{]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*:/g, '$1"$2":');
-
+ raw = raw
+ .replace(/([,{]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*:/g, '$1"$2":') // quote unquoted keys
+ .replace(/:\s*([a-zA-Z_][a-zA-Z0-9_.:-]*)(?=\s*[,}\]])/g, (_, p1) => {
+ // quote unquoted strings, ignoring booleans
+ const protectedValues = ["true", "false", "1b", "0b"];
+ if (protectedValues.includes(p1.toLowerCase())) {
+ return `: ${p1.toLowerCase()}`;
+ }
+ return `: "${p1}"`;
+ });
if (raw.match(/^"\w*"/)) {
return [raw.replace(/"/g, "")];
}
@@ -44,9 +52,15 @@ export function convertToTextOrEmpty(raw: string): StringyMCText[] {
try {
parsed = JSON.parse(raw);
- } catch {
+ } catch (err) {
return [
- "An error occurred while parsing the SNBT. If this is a bug, please report it to DPH staff!",
+ "",
+ { color: "red", text: "An error occurred while parsing the SNBT." },
+ { color: "yellow", text: " Please send the " },
+ { color: "gold", text: "following error message" },
+ { color: "yellow", text: " to Datapack Hub staff:\n" },
+ { color: "white", bold: true, text: "Error: " },
+ { color: "gray", text: err!.toString() },
];
}
@@ -78,53 +92,29 @@ function processTextComponent(text: StringyMCText, baseDocument: JSONContent) {
finalText = applyStyling(text, finalText);
let paragraphContent = baseDocument.content?.at(-1)?.content;
-
- if (!paragraphContent) {
- baseDocument.content!.at(-1)!.content = [];
- paragraphContent = baseDocument.content!.at(-1)!.content;
- }
-
paragraphContent!.push(finalText);
// Extra property
if (text.extra) {
text.extra!.forEach((txt) => {
- if (typeof txt == "object") {
- Object.assign(txt, {
- bold: txt.bold ?? text.bold,
- italic: txt.italic ?? text.italic,
- underlined: txt.underlined ?? text.underlined,
- obfuscated: txt.obfuscated ?? text.obfuscated,
- strikethrough: txt.strikethrough ?? text.strikethrough,
- color: txt.color ?? text.color,
- shadow_color: txt.shadow_color ?? text.shadow_color,
- click_event: txt.click_event ?? text.click_event,
- clickEvent: txt.clickEvent ?? text.clickEvent,
- hover_event: txt.hover_event ?? text.hover_event,
- hoverEvent: txt.hoverEvent ?? text.hoverEvent,
- font: txt.font ?? text.font,
- });
- processTextComponent(txt, baseDocument);
- } else {
- let newComponent = {
- text: txt,
- };
- Object.assign(newComponent, {
- bold: text.bold,
- italic: text.italic,
- underlined: text.underlined,
- obfuscated: text.obfuscated,
- strikethrough: text.strikethrough,
- color: text.color,
- shadow_color: text.shadow_color,
- click_event: text.click_event,
- clickEvent: text.clickEvent,
- hover_event: text.hover_event,
- hoverEvent: text.hoverEvent,
- font: text.font,
- });
- processTextComponent(newComponent, baseDocument);
- }
+ const newText = typeof txt === "object" ? { ...txt } : { text: txt };
+
+ Object.assign(newText, {
+ bold: text.bold ?? newText.bold,
+ italic: text.italic ?? newText.italic,
+ underlined: text.underlined ?? newText.underlined,
+ obfuscated: text.obfuscated ?? newText.obfuscated,
+ strikethrough: text.strikethrough ?? newText.strikethrough,
+ color: text.color ?? newText.color,
+ shadow_color: text.shadow_color ?? newText.shadow_color,
+ click_event: text.click_event ?? newText.click_event,
+ clickEvent: text.clickEvent ?? newText.clickEvent,
+ hover_event: text.hover_event ?? newText.hover_event,
+ hoverEvent: text.hoverEvent ?? newText.hoverEvent,
+ font: text.font ?? newText.font,
+ });
+
+ processTextComponent(newText, baseDocument);
});
}
}
@@ -238,9 +228,9 @@ function applyStyling(
}
if (text.font) {
- if (finalText.marks.some((mark) => mark.type === "textStyle")) {
- finalText.marks.find((mark) => mark.type === "textStyle")!.attrs!.font =
- text.font;
+ const textStyle = finalText.marks.find((mark) => mark.type === "textStyle");
+ if (textStyle) {
+ textStyle.attrs!.font = text.font;
} else {
finalText.marks?.push({
type: "textStyle",
diff --git a/src/lib/text/nbt_or_json.ts b/src/lib/text/nbt/nbt_or_json.ts
similarity index 57%
rename from src/lib/text/nbt_or_json.ts
rename to src/lib/text/nbt/nbt_or_json.ts
index c5dec26..c6de796 100644
--- a/src/lib/text/nbt_or_json.ts
+++ b/src/lib/text/nbt/nbt_or_json.ts
@@ -1,5 +1,4 @@
import type {
- MCTextKey,
MinecraftText,
OldMinecraftText,
StringyMCText,
@@ -11,27 +10,13 @@ import {
isMarkType,
trueMarkOrUndefined,
unescapeUnicode,
-} from "./general";
+} from "../utils";
import { outputVersion } from "$lib/stores";
import { get } from "svelte/store";
+import { optimise } from "./optimiser";
let exportVersion = get(outputVersion);
-const styleProps = [
- "color",
- "font",
- "bold",
- "italic",
- "underlined",
- "strikethrough",
- "obfuscated",
- "shadow_color",
- "click_event",
- "hover_event",
- "clickEvent",
- "hoverEvent",
-];
-
/**
* Applies the specific properties for a type of source or provider
*
@@ -177,168 +162,6 @@ function oldApplyInteractiveValues(current: OldMinecraftText, c: JSONContent) {
}
}
-/**
- * Optimises the final outputted component string to reduce characters
- *
- * @param arr An array of strings or text components
- * @returns
- */
-export function optimise(arr: StringyMCText[], lore = false): StringyMCText[] {
- let out: StringyMCText[] = [];
-
- if (!lore) {
- out.push("");
- }
-
- // 1: Remove undefineds, flatten MinecraftText with only text
- for (const comp of arr) {
- if (typeof comp === "string") {
- out.push(comp);
- continue;
- }
- if ("text" in comp) {
- Object.keys(comp).forEach(
- (k) =>
- comp[k as MCTextKey] === undefined && delete comp[k as MCTextKey],
- );
- }
- out.push(Object.keys(comp).length === 1 ? comp.text! : comp);
- }
-
- // 2: Merge adjacent strings and whitespace, group objects with shared style
- for (let i = 0; i < out.length - 1; i++) {
- const curr = out[i],
- next = out[i + 1];
-
- // Merge whitespace to prev component
- // todo fix
- // if (typeof curr === "object" && curr?.text && typeof next === "string" && (next.trim() === "" || next.trim() === "\n")) {
- // curr.text += next;
- // out.splice(i + 1, 1); i--;
- // continue;
- // }
- // Merge consecutive strings
- if (typeof curr === "string" && typeof next === "string") {
- out[i] = curr + next;
- out.splice(i + 1, 1);
- i--;
- continue;
- }
-
- // Find shared style/interactivity properties between consecutive objects
- if (typeof curr === "object" && typeof next === "object") {
- const shared: Record = {};
- for (const prop of styleProps) {
- const p = prop as MCTextKey;
- if (
- curr[p] !== undefined &&
- next[p] !== undefined &&
- curr[p] === next[p]
- ) {
- shared[prop] = curr[p];
- }
- }
- // Merge all properties in styleProps that are identical across the group
- const allProps = [...styleProps];
- const sharedAll: Record = {};
- for (const prop of allProps) {
- const p = prop as MCTextKey;
- if (
- curr[p] !== undefined &&
- next[p] !== undefined &&
- (prop === "hover_event" ||
- prop === "click_event" ||
- prop === "hoverEvent" ||
- prop === "clickEvent"
- ? JSON.stringify(curr[p]) === JSON.stringify(next[p])
- : curr[p] === next[p])
- ) {
- sharedAll[p] = curr[p];
- }
- }
- if (Object.keys(sharedAll).length > 0) {
- // Find how many consecutive objects share these properties
- let j = i;
- let group = [curr];
-
- while (
- j + 1 < out.length &&
- typeof out[j + 1] === "object" &&
- Object.keys(sharedAll).every(
- (prop) =>
- out[j + 1][prop as keyof StringyMCText] !== undefined &&
- (prop === "hover_event" ||
- prop === "click_event" ||
- prop === "hoverEvent" ||
- prop === "clickEvent"
- ? JSON.stringify(out[j + 1][prop as keyof StringyMCText]) ===
- JSON.stringify(sharedAll[prop])
- : out[j + 1][prop as keyof StringyMCText] === sharedAll[prop]),
- )
- ) {
- group.push(out[j + 1] as MinecraftText);
- j++;
- }
- if (group.length > 1) {
- // Remove shared properties from each group member for "extra"
- let extras: StringyMCText[] = group.map((comp) => {
- const c = { ...comp };
- for (const prop of Object.keys(sharedAll)) {
- delete c[prop as MCTextKey];
- }
- return c;
- });
-
- // Optimise extra
- extras = optimise(extras);
- const first = extras.shift();
- let merged;
- if (typeof first == "string") {
- if (extras[0]) {
- merged = { ...sharedAll, text: first, extra: extras };
- } else {
- merged = { ...sharedAll, text: first };
- }
- } else {
- if (extras[0]) {
- merged = { ...sharedAll, ...first, extra: extras };
- } else {
- merged = { ...sharedAll, ...first };
- }
- }
- out.splice(i, group.length, merged);
- i--; // recheck at this position
- continue;
- }
- }
- }
- }
-
- // 3: Remove leading empty string if followed by a string
- if (out.length >= 2 && out[0] === "" && typeof out[1] === "string")
- out.shift();
-
- // 4: If out[1] is a string, or an object without any style properties, then remove out[0]
- if (
- out.length >= 2 &&
- out[0] == "" &&
- (typeof out[1] === "string" ||
- (typeof out[1] === "object" &&
- !styleProps.some(
- (prop) => out[1][prop as keyof StringyMCText] !== undefined,
- )))
- ) {
- out.shift();
- }
-
- // 5: If it is item lore then override
- if (lore) {
- out.unshift({ italic: false, color: "white", text: "" });
- }
-
- return out;
-}
-
/**
* Converts the JSON content of the editor to an NBT string.
*/
@@ -386,10 +209,9 @@ export function translateJSON(
const shadowColorMark = c.marks?.find((m) => m.type === "shadowColor");
if (shadowColorMark) {
- current.shadow_color = parseInt(
- shadowColorMark.attrs?.shadowColor.replace(/^#/, ""),
- 16,
- );
+ current.shadow_color =
+ parseInt(shadowColorMark.attrs?.shadowColor.replace(/^#/, ""), 16) +
+ (0xff << 24); // TODO: transparency coming eventually?
}
current = addTypeSpecificValues(current, c, true);
@@ -400,7 +222,7 @@ export function translateJSON(
if (data.length === 0) {
return Math.random() < 0.002
- ? "🤓 <- james is waiting for you to type something"
+ ? "🤓 <- kevin is waiting for you to type something"
: "waiting for input...";
}
@@ -411,14 +233,10 @@ export function translateJSON(
}
if (data.length === 1) {
- return options.indent
- ? JSON.stringify(data[0], null, options.indentSize)
- : JSON.stringify(data[0]);
+ return JSON.stringify(data[0]);
}
- return options.indent
- ? JSON.stringify(data, null, options.indentSize)
- : JSON.stringify(data);
+ return JSON.stringify(data);
} else if (options.exportType === "item_lore") {
let data: (StringyMCText[] | StringyMCText)[] = [];
@@ -448,9 +266,7 @@ export function translateJSON(
data = data.map((d) => (Array.isArray(d) ? optimise(d, true) : d));
}
- return options.indent
- ? JSON.stringify(data, null, options.indentSize)
- : JSON.stringify(data);
+ return JSON.stringify(data);
}
return "[]";
diff --git a/src/lib/text/nbt/optimiser.ts b/src/lib/text/nbt/optimiser.ts
new file mode 100644
index 0000000..92337ed
--- /dev/null
+++ b/src/lib/text/nbt/optimiser.ts
@@ -0,0 +1,279 @@
+import type { MCTextKey, MinecraftText, StringyMCText } from "$lib/types";
+import { isAnInteractiveProp, isDefinedTextObject } from "../utils";
+
+const styleProps = [
+ "color",
+ "font",
+ "bold",
+ "italic",
+ "underlined",
+ "strikethrough",
+ "obfuscated",
+ "shadow_color",
+ "click_event",
+ "hover_event",
+ "clickEvent",
+ "hoverEvent",
+] as const;
+
+/**
+ * Optimises the final outputted component string to reduce characters
+ *
+ * @param stringyTextElements An array of strings or text components
+ * @returns the string or text components optimised
+ */
+export function optimise(
+ stringyTextElements: StringyMCText[],
+ lore = false,
+): StringyMCText[] {
+ let output: StringyMCText[] = [];
+
+ if (!lore) {
+ // add leading empty string for non-lore due to how Minecraft handles text components
+ output.push("");
+ }
+
+ // Early return for single string
+ if (
+ stringyTextElements.length === 1 &&
+ typeof stringyTextElements[0] === "string"
+ ) {
+ return stringyTextElements;
+ }
+
+ output.push(...flattenMCText(stringyTextElements));
+ output = mergeTextComponents(output);
+
+ // remove leading empty string if followed by a string
+ if (output.length >= 2 && output[0] === "" && typeof output[1] === "string")
+ output.shift();
+
+ if (shouldHaveLeadingEmptyString(output)) {
+ output.shift();
+ }
+
+ // if it is item lore then override
+ if (lore) {
+ output.unshift({ italic: false, color: "white", text: "" });
+ }
+ return output;
+}
+
+/**
+ * Gets all shared style properties between two MinecraftText components
+ *
+ * @param a text component a to check
+ * @param b text component b to check
+ * @returns a record of shared style properties
+ */
+function getSharedStyleProps(
+ a: MinecraftText,
+ b: MinecraftText,
+): Record {
+ const allSharedProps: Record = {} as Record<
+ keyof MinecraftText,
+ any
+ >;
+ for (const prop of styleProps) {
+ const p = prop as MCTextKey;
+ if (
+ a[p] !== undefined &&
+ b[p] !== undefined &&
+ propsMatch(a[p], b[p], prop)
+ ) {
+ allSharedProps[p] = a[p];
+ }
+ }
+ return allSharedProps;
+}
+
+/**
+ * Collects all MinecraftText components from the current index that share the same style properties
+ *
+ * @param i the current index into the array
+ * @param group the current group of MinecraftText components being collected
+ * @param output the current output array
+ * @param allSharedProps a record of all shared properties between the group
+ */
+function collectAllFromIndex(
+ i: number,
+ group: MinecraftText[],
+ output: StringyMCText[],
+ allSharedProps: Record,
+) {
+ let j = i;
+ let sharedKeys = Object.keys(allSharedProps) as (keyof MinecraftText)[];
+ while (output[j + 1] && typeof output[j + 1] === "object") {
+ const next = output[j + 1] as MinecraftText;
+ let allPropertiesMatch = sharedKeys.every(
+ (prop) =>
+ next[prop] !== undefined &&
+ propsMatch(next[prop], allSharedProps[prop], prop),
+ );
+
+ if (!allPropertiesMatch) break;
+
+ group.push(next);
+ j++;
+ }
+}
+
+/**
+ * Checks if two properties match, considering interactive properties
+ *
+ * @param a property A
+ * @param b property B
+ * @param property the property to check for
+ * @returns true if the properties match, false otherwise
+ */
+function propsMatch(a: any, b: any, property: string) {
+ return isAnInteractiveProp(property)
+ ? JSON.stringify(a) === JSON.stringify(b)
+ : a === b;
+}
+
+/**
+ * Determines if the final output should have the leading empty string removed
+ *
+ * @param output the optimized output array
+ * @returns true if the final output should have the leading empty string removed
+ */
+function shouldHaveLeadingEmptyString(output: StringyMCText[]): boolean {
+ return (
+ output.length >= 2 &&
+ output[0] == "" &&
+ (typeof output[1] === "string" ||
+ (typeof output[1] === "object" &&
+ !styleProps.some(
+ (prop) => output[1][prop as keyof StringyMCText] !== undefined,
+ )))
+ );
+}
+
+/**
+ * Flattens the text elements by converting objects with only text property to strings and removing undefined properties
+ *
+ * @param stringyTextElements the text elements
+ * @returns the elements with strings becoming string literals and cleaned object properties
+ */
+function flattenMCText(stringyTextElements: StringyMCText[]): StringyMCText[] {
+ const output: StringyMCText[] = [];
+ for (const component of stringyTextElements) {
+ if (typeof component === "string") {
+ // string, just add
+ output.push(component);
+ continue;
+ }
+
+ if ("text" in component) {
+ // MinecraftText with text property
+ for (const [key, value] of Object.entries(component)) {
+ if (value === undefined) {
+ delete component[key as MCTextKey]; // remove undefined properties
+ }
+ }
+ }
+
+ // if only text property remains, convert to string
+ output.push(
+ Object.keys(component).length === 1 ? component.text! : component,
+ );
+ }
+ return output;
+}
+
+/**
+ * Merges adjacent strings and whitespace, groups objects with shared style/interactivity properties
+ *
+ * @param output the optimized output step
+ * @returns the optimized output step with merged strings, whitespace and group properties with shared styling
+ */
+function mergeTextComponents(output: StringyMCText[]) {
+ for (let i = 0; i < output.length - 1; i++) {
+ const current = output[i],
+ next = output[i + 1];
+
+ // Merge whitespace to next component
+ if (
+ isDefinedTextObject(current) &&
+ typeof next === "string" &&
+ next.match(/^\s*$/)
+ ) {
+ current.text += next;
+ output.splice(i + 1, 1);
+ i--;
+ continue;
+ }
+
+ // Merge whitespace objects to next component
+ if (isDefinedTextObject(current) && isDefinedTextObject(next)) {
+ // which direction to merge
+ if (next.text.match(/^\s*$/)) {
+ current.text += next.text;
+ output.splice(i + 1, 1);
+ i--;
+ continue;
+ } else if (current.text.match(/^\s*$/)) {
+ next.text = current.text + next.text;
+ output.splice(i, 1);
+ i--;
+ continue;
+ }
+ }
+
+ // Merge consecutive strings
+ if (typeof current === "string" && typeof next === "string") {
+ output[i] = current + next;
+ output.splice(i + 1, 1);
+ i--;
+ continue;
+ }
+
+ // Find shared style/interactivity properties between consecutive objects
+ if (typeof current === "object" && typeof next === "object") {
+ const sharedProperties = getSharedStyleProps(current, next);
+ console.log("Shared Properties:", sharedProperties);
+
+ if (Object.keys(sharedProperties).length > 0) {
+ let group = [current];
+ collectAllFromIndex(i, group, output, sharedProperties);
+ console.log("Group Collected:", group);
+
+ if (group.length < 1) {
+ continue;
+ }
+
+ // Remove shared properties from each group member for "extra"
+ let extras: StringyMCText[] = group.map((comp) => {
+ const copy = { ...comp };
+ for (const prop of Object.keys(sharedProperties)) {
+ delete copy[prop as MCTextKey];
+ }
+ return copy;
+ });
+
+ // Optimise extra
+ extras = optimise(extras);
+ const first = extras.shift();
+ let merged = { ...sharedProperties };
+ // Rebuild merged component
+ if (typeof first == "string") {
+ merged.text = first;
+ if (extras.length > 0) {
+ if (!merged.extra) merged.extra = extras;
+ else merged.extra = merged.extra.concat(extras);
+ }
+ } else {
+ Object.assign(merged, { ...first });
+ if (extras.length > 0) {
+ if (!merged.extra) merged.extra = extras;
+ else merged.extra = merged.extra.concat(extras);
+ }
+ }
+ output.splice(i, group.length, merged);
+ // i--; // TODO: actually fix the bug caused by checking again
+ }
+ }
+ }
+ return output;
+}
diff --git a/src/lib/text/general.ts b/src/lib/text/utils.ts
similarity index 84%
rename from src/lib/text/general.ts
rename to src/lib/text/utils.ts
index 72e7155..54c043e 100644
--- a/src/lib/text/general.ts
+++ b/src/lib/text/utils.ts
@@ -1,18 +1,39 @@
+import type { MinecraftText } from "$lib/types";
import type { Editor, JSONContent } from "@tiptap/core";
import { generateGradient } from "typescript-color-gradient";
+export const colorMap = [
+ { name: "dark_red", value: "#AA0000", code: "4" },
+ { name: "red", value: "#FF5555", code: "c" },
+ { name: "gold", value: "#FFAA00", code: "6" },
+ { name: "yellow", value: "#FFFF55", code: "e" },
+ { name: "green", value: "#55FF55", code: "2" },
+ { name: "dark_green", value: "#00AA00", code: "a" },
+ { name: "aqua", value: "#55FFFF", code: "b" },
+ { name: "dark_aqua", value: "#00AAAA", code: "3" },
+ { name: "blue", value: "#5555FF", code: "1" },
+ { name: "dark_blue", value: "#0000AA", code: "9" },
+ { name: "dark_purple", value: "#AA00AA", code: "d" },
+ { name: "light_purple", value: "#FF55FF", code: "5" },
+ { name: "white", value: "#FFFFFF", code: "f" },
+ { name: "gray", value: "#AAAAAA", code: "7" },
+ { name: "dark_gray", value: "#555555", code: "8" },
+ { name: "black", value: "#000000", code: "0" },
+];
+
/**
+ * Returns true if the specified mark is present in the content's marks, otherwise undefined.
+ *
* @param content the node to check
* @param mark the mark to check
* @returns the mark if true, undefined otherwise
*/
-
export function trueMarkOrUndefined(
content: JSONContent,
mark: string,
): true | undefined {
- const value = content.marks?.some((e) => e.type === mark);
- return value === true ? value : undefined;
+ const value = content.marks?.some((e) => e.type === mark) || false;
+ return value ? value : undefined;
}
/**
* A LUT to find the name of a color
@@ -124,21 +145,23 @@ export function applyGradient(editor: Editor, gradientColors: string[]) {
chain.run();
}
-export const colorMap = [
- { name: "dark_red", value: "#AA0000", code: "4" },
- { name: "red", value: "#FF5555", code: "c" },
- { name: "gold", value: "#FFAA00", code: "6" },
- { name: "yellow", value: "#FFFF55", code: "e" },
- { name: "green", value: "#55FF55", code: "2" },
- { name: "dark_green", value: "#00AA00", code: "a" },
- { name: "aqua", value: "#55FFFF", code: "b" },
- { name: "dark_aqua", value: "#00AAAA", code: "3" },
- { name: "blue", value: "#5555FF", code: "1" },
- { name: "dark_blue", value: "#0000AA", code: "9" },
- { name: "dark_purple", value: "#AA00AA", code: "d" },
- { name: "light_purple", value: "#FF55FF", code: "5" },
- { name: "white", value: "#FFFFFF", code: "f" },
- { name: "gray", value: "#AAAAAA", code: "7" },
- { name: "dark_gray", value: "#555555", code: "8" },
- { name: "black", value: "#000000", code: "0" },
-];
+export function isAnInteractiveProp(prop: string) {
+ return (
+ prop === "click_event" ||
+ prop === "hover_event" ||
+ prop === "clickEvent" ||
+ prop === "hoverEvent"
+ );
+}
+
+/**
+ * Checks if an object is a defined MinecraftText object
+ *
+ * @param obj the object to check
+ * @returns true if it is a defined MinecraftText object
+ */
+export function isDefinedTextObject(
+ obj: any,
+): obj is Omit & { text: string } {
+ return typeof obj === "object" && obj.text !== undefined;
+}
diff --git a/src/lib/types.ts b/src/lib/types.ts
index aa4ebc1..5b9b49b 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -147,8 +147,6 @@ export type ExternalSources = {
export type MCTextKey = keyof MinecraftText;
export type TranslateOptions = Partial<{
- indent: boolean;
- indentSize: number;
optimise: boolean;
exportType: "standard" | "item_lore";
}>;
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 239fe7b..d967355 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,7 +1,8 @@