diff --git a/src/lib/globals.ts b/src/lib/globals.ts
new file mode 100644
index 0000000..b74b696
--- /dev/null
+++ b/src/lib/globals.ts
@@ -0,0 +1 @@
+export const welcomeScreenFormat = "1";
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index ba6c0ec..264d089 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -5,6 +5,7 @@ export type Settings = {
showCharacterCount: boolean; // whether the character count is shown
syntaxHighlight: boolean; // whether to show highlighted output text
realisticLineHeight: boolean; // whether to use smaller line height
+ hideSelectionExport: boolean; // whether to hide the export this button
fontSize: number; // 0 = small, 1 = default, 2 = large
};
@@ -32,5 +33,6 @@ export const appSettings: Writable = createPersistentStore("settings",
showCharacterCount: true,
syntaxHighlight: true,
realisticLineHeight: false,
+ hideSelectionExport: true,
fontSize: 1,
});
diff --git a/src/lib/text/nbt/export.ts b/src/lib/text/nbt/export.ts
index 3512961..1de6a97 100644
--- a/src/lib/text/nbt/export.ts
+++ b/src/lib/text/nbt/export.ts
@@ -22,7 +22,7 @@ let exportVersion = get(outputVersion);
* @param outputVersion the version to export to
* @returns the current component with new properties
*/
-export function addTypeSpecificValues(
+export function addTypeSpecificValues( // TODO maybe merge this into constructComponent()
current: MinecraftText,
c: JSONContent,
includeInteractivity = true,
@@ -203,29 +203,7 @@ export function translateJSON(json: JSONContent, options: TranslateOptions): str
for (const [i, p] of paragraphs.entries()) {
const content = p.content ?? [];
for (const c of content) {
- let current: MinecraftText = {
- color: defaultColorLUT(c.marks?.at(0)?.attrs?.color),
- bold: trueMarkOrUndefined(c, "bold"),
- italic: trueMarkOrUndefined(c, "italic"),
- strikethrough: trueMarkOrUndefined(c, "strike"),
- underlined: trueMarkOrUndefined(c, "underline"),
- obfuscated: trueMarkOrUndefined(c, "obfuscated"),
- font: c.marks?.at(0)?.attrs?.font || undefined,
- };
-
- const shadowColorMark = c.marks?.find((m) => m.type === "shadowColor");
- if (shadowColorMark) {
- let colorVal: string = shadowColorMark.attrs?.shadowColor.replace(/^#/u, "");
- if (colorVal && colorVal.length <= 8) {
- current.shadow_color = parseInt(
- rgbaToArgbHex(colorVal.padEnd(8, "FF")).replace(/^#/u, ""),
- 16,
- );
- }
- }
-
- current = addTypeSpecificValues(current, c, true);
- data.push(current);
+ data.push(constructComponent(c));
}
if (i < paragraphs.length - 1) data.push("\n");
}
@@ -242,13 +220,13 @@ export function translateJSON(json: JSONContent, options: TranslateOptions): str
data.unshift("");
}
- if (data.length === 1) {
- return JSON.stringify(data[0]);
+ if (data.length === 2 && data[0] == "") {
+ return JSON.stringify(data[1]);
+ } else if (data.length === 1) {
+ return JSON.stringify(data[0])
}
- let finalResult = JSON.stringify(data);
-
- return finalResult;
+ return JSON.stringify(data);
} else if (options.exportType === "item_lore") {
let data: (StringyMCText[] | StringyMCText)[] = [];
@@ -257,18 +235,7 @@ export function translateJSON(json: JSONContent, options: TranslateOptions): str
let currentLine: StringyMCText[] = [];
for (const [_, c] of content.entries()) {
- let currentComponent: MinecraftText = {
- color: defaultColorLUT(c.marks?.at(0)?.attrs?.color),
- bold: trueMarkOrUndefined(c, "bold"),
- italic: trueMarkOrUndefined(c, "italic"),
- strikethrough: trueMarkOrUndefined(c, "strike"),
- underlined: trueMarkOrUndefined(c, "underline"),
- obfuscated: trueMarkOrUndefined(c, "obfuscated"),
- font: c.marks?.at(0)?.attrs?.font || undefined,
- };
-
- currentComponent = addTypeSpecificValues(currentComponent, c, false);
- currentLine.push(currentComponent);
+ currentLine.push(constructComponent(c, false));
}
data.push(currentLine);
@@ -283,3 +250,36 @@ export function translateJSON(json: JSONContent, options: TranslateOptions): str
return "[]";
}
+
+/**
+ * Constructs a component from a given Tiptap JSON content object
+ */
+function constructComponent(content: JSONContent, includeInteractivity: boolean = true) {
+ // Construct basic styled component
+ let currentComponent: MinecraftText = {
+ color: defaultColorLUT(content.marks?.find(obj => obj.type == "textStyle")?.attrs?.color || undefined),
+ bold: trueMarkOrUndefined(content, "bold"),
+ italic: trueMarkOrUndefined(content, "italic"),
+ strikethrough: trueMarkOrUndefined(content, "strike"),
+ underlined: trueMarkOrUndefined(content, "underline"),
+ obfuscated: trueMarkOrUndefined(content, "obfuscated"),
+ font: content.marks?.find(obj => obj.type == "textStyle")?.attrs?.font || undefined,
+ };
+
+ // Add shadow colour
+ const shadowColorMark = content.marks?.find((m) => m.type === "shadowColor");
+ if (shadowColorMark) {
+ let colorVal: string = shadowColorMark.attrs?.shadowColor.replace(/^#/u, "");
+ if (colorVal && colorVal.length <= 8) {
+ currentComponent.shadow_color = parseInt(
+ rgbaToArgbHex(colorVal.padEnd(8, "FF")).replace(/^#/u, ""),
+ 16,
+ );
+ }
+ }
+
+ // Add content values (e.g. text and custom sources) depending on the component type
+ currentComponent = addTypeSpecificValues(currentComponent, content, includeInteractivity);
+
+ return currentComponent
+}
\ No newline at end of file
diff --git a/src/lib/text/nbt/optimiser.ts b/src/lib/text/nbt/optimiser.ts
index 3845b81..7c99cb5 100644
--- a/src/lib/text/nbt/optimiser.ts
+++ b/src/lib/text/nbt/optimiser.ts
@@ -39,12 +39,13 @@ export function optimise(stringyTextElements: StringyMCText[], lore = false): St
}
output.push(...flattenMCText(stringyTextElements));
- output = mergeTextComponents(output);
+ output = mergeTextComponents(mergeTextComponents(output));
// if it is item lore then override
if (lore) {
output.unshift({ italic: false, color: "white", text: "" });
}
+
return output;
}
diff --git a/src/lib/text/utils.ts b/src/lib/text/utils.ts
index 3aa4f08..9153a70 100644
--- a/src/lib/text/utils.ts
+++ b/src/lib/text/utils.ts
@@ -44,7 +44,7 @@ export function trueMarkOrUndefined(content: JSONContent, mark: string): true |
return value ? value : undefined;
}
/**
- * A LUT to find the name of a color
+ * A LUT to get the correct color value
*
* @param color the hex code
* @returns the color name
@@ -53,6 +53,9 @@ export function defaultColorLUT(color: string): string | undefined {
if (!color || color === "null") {
return;
}
+
+ color = rgbToHex(color)
+
return colourMap.find((e) => e.value.toUpperCase() === color)?.name || color;
}
@@ -162,3 +165,18 @@ export function rgbaToArgbHex(rgbaHex: string): string {
// Return with alpha placed at the beginning
return `#${alpha}${rgb}`;
}
+
+export function rgbToHex(color: string): string {
+ if (color.startsWith('rgb')) {
+ const result = /^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/u.exec(color);
+ return result
+ ? "#" +
+ [1, 2, 3]
+ .map((n) => parseInt(result[n]).toString(16).padStart(2, "0"))
+ .join("")
+ .toUpperCase()
+ : color;
+ } else {
+ return color.toUpperCase()
+ }
+}
diff --git a/src/lib/tiptap/extensions/ExportButton.ts b/src/lib/tiptap/extensions/ExportButton.ts
new file mode 100644
index 0000000..7fd5c03
--- /dev/null
+++ b/src/lib/tiptap/extensions/ExportButton.ts
@@ -0,0 +1,79 @@
+import { Extension } from '@tiptap/core';
+import { Plugin, PluginKey } from '@tiptap/pm/state';
+import { EditorView } from '@tiptap/pm/view';
+import { appSettings } from "$lib/settings";
+import { get } from 'svelte/store';
+
+// Define the shape of configuration options for type safety
+export interface ExportButtonOptions {
+ onClick: () => void;
+}
+
+export const ExportButtonExtension = Extension.create({
+ name: 'ExportButton',
+
+ addOptions() {
+ return {
+ onClick: () => { },
+ };
+ },
+
+ addProseMirrorPlugins() {
+ const { onClick } = this.options;
+ let buttonDom: HTMLButtonElement | null = null;
+
+ return [
+ new Plugin({
+ key: new PluginKey('ExportButton'),
+ view(editorView: EditorView) {
+ return {
+ update(view: EditorView) {
+ if (get(appSettings).hideSelectionExport == true) {
+ return;
+ }
+
+ const { state } = view;
+ const { selection } = state;
+
+ const parentNode = view.dom.parentNode as HTMLElement | null;
+ if (!parentNode) return;
+
+ if ((selection.empty || !view.hasFocus()) && buttonDom) {
+ buttonDom.style.display = 'none';
+ return;
+ }
+
+ if (!buttonDom) {
+ buttonDom = document.createElement('button');
+ buttonDom.innerText = '↪ Export this';
+ buttonDom.className = 'export-button';
+ buttonDom.style.position = 'absolute';
+ buttonDom.style.zIndex = '10';
+
+ buttonDom.addEventListener('mousedown', (e: MouseEvent) => e.preventDefault());
+ buttonDom.addEventListener('click', onClick);
+
+ parentNode.appendChild(buttonDom);
+ }
+
+ const coords = view.coordsAtPos(selection.to);
+ const top = coords.top + 19;
+ const left = coords.left - 90;
+
+ buttonDom.style.display = 'block';
+ buttonDom.style.top = `${top}px`;
+ buttonDom.style.left = `${left + 5}px`;
+ },
+
+ destroy() {
+ if (buttonDom) {
+ buttonDom.remove();
+ buttonDom = null;
+ }
+ }
+ };
+ },
+ }),
+ ];
+ },
+});
diff --git a/src/lib/tiptap/extensions/FixedTextStyle.ts b/src/lib/tiptap/extensions/FixedTextStyle.ts
index da0f179..0dcf61e 100644
--- a/src/lib/tiptap/extensions/FixedTextStyle.ts
+++ b/src/lib/tiptap/extensions/FixedTextStyle.ts
@@ -1,3 +1,4 @@
+import { rgbToHex } from "$lib/text/utils";
import { TextStyle } from "@tiptap/extension-text-style";
export const FixedTextStyle = TextStyle.extend({
@@ -13,15 +14,3 @@ export const FixedTextStyle = TextStyle.extend({
];
},
});
-
-// Helper function to convert rgb() to hex
-function rgbToHex(rgb: string): string {
- const result = /^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/u.exec(rgb);
- return result
- ? "#" +
- [1, 2, 3]
- .map((n) => parseInt(result[n]).toString(16).padStart(2, "0"))
- .join("")
- .toUpperCase()
- : rgb;
-}
diff --git a/src/lib/tiptap/extensions/marks/ClickEventMark.ts b/src/lib/tiptap/extensions/marks/ClickEventMark.ts
index 55ef636..bb3ccfa 100644
--- a/src/lib/tiptap/extensions/marks/ClickEventMark.ts
+++ b/src/lib/tiptap/extensions/marks/ClickEventMark.ts
@@ -4,6 +4,8 @@ import { type ClickEventAttributes } from "../index";
export const ClickEventMark = Mark.create({
name: "clickEvent",
+ spanning: true,
+ priority: 1000,
addAttributes(): ClickEventAttributes {
return {
diff --git a/src/lib/tiptap/extensions/marks/HoverEventMark.ts b/src/lib/tiptap/extensions/marks/HoverEventMark.ts
index 6f4c4d9..74a3108 100644
--- a/src/lib/tiptap/extensions/marks/HoverEventMark.ts
+++ b/src/lib/tiptap/extensions/marks/HoverEventMark.ts
@@ -3,6 +3,8 @@ import type { HoverEventAttributes } from "../index";
export const HoverEventMark = Mark.create({
name: "hoverEvent",
+ spanning: true,
+ priority: 1000,
addAttributes(): HoverEventAttributes {
return {
diff --git a/src/lib/tiptap/extensions/marks/ObfuscationMark.ts b/src/lib/tiptap/extensions/marks/ObfuscationMark.ts
index 43f8d77..87687de 100644
--- a/src/lib/tiptap/extensions/marks/ObfuscationMark.ts
+++ b/src/lib/tiptap/extensions/marks/ObfuscationMark.ts
@@ -2,18 +2,28 @@ import { Mark, mergeAttributes } from "@tiptap/core";
export const Obfuscation = Mark.create({
name: "obfuscated",
+
renderHTML({ HTMLAttributes }) {
return [
"span",
mergeAttributes(
{
- class: "obfuscated",
+ class: "obfuscated"
},
HTMLAttributes,
),
0,
];
},
+
+ parseHTML() {
+ return [
+ {
+ tag: "span.obfuscated",
+ },
+ ];
+ },
+
addOptions() {
return {
HTMLAttributes: {},
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 53a6d7c..4c15cbe 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,4 +1,6 @@