Merge pull request #4 from Lapis256/beta

add RawTextBuilder

Author: Lapis256

src/command.js

@@ -1,48 +1,37 @@
-import { Commands, World } from "mojang-minecraft";
-import { mergeObject } from "./object.js";
-
-
-class CommandResult {
-    constructor(isError, obj) {
-        this.isError = isError;
-        
-        mergeObject(this, obj);
-    }
-}
-
-export const Command = new (class {
-    #run(command, dimension = "overworld") {
-        if(typeof dimension === "string") {
-            dimension = World.getDimension(dimension);
-        }
-        return Commands.run(command, dimension);
-    }
-
-    run(command, dimension) {
-        return this.#run(command, dimension);
-    }
-
-    runSafe(command, dimension) {
-        try {
-            return new CommandResult(false, this.#run(command, dimension));
-        }
-        catch(e) {
-            return new CommandResult(true, e);
-        }
-    }
-
-    selectorBuilder(selector, selectors) {
-        if(!selectors) {
-            if(selector.startsWith("@")) return selector;
-            else return `"${selector}"`;
-        }
-
-        const selectorArray = [];
-        for(const key in selectors) {
-            const rawValue = selectors[key];
-            const value = rawValue.includes(" ") ? `"${rawValue}"` : rawValue;
-            selectorArray.push(`${key}=${value}`);
-        }
-        return `${selector}[${selectorArray.join(",")}]`;
-    }
-})();
+import { Dimension, Entity } from "mojang-minecraft";
+
+
+export default class Command {
+    #run(command, object) {
+        if(object.runCommand === undefined) return;
+        return object.runCommand(command);
+    }
+
+    static run(command, object) {
+        return this.#run(command, object);
+    }
+
+    static runSafe(command, object) {
+        try {
+            return new CommandResult(false, this.#run(command, dimension));
+        }
+        catch(e) {
+            return new CommandResult(true, e);
+        }
+    }
+
+    static selectorBuilder(selector, selectors) {
+        if(!selectors) {
+            if(selector.startsWith("@")) return selector;
+            else return `"${selector}"`;
+        }
+
+        const selectorArray = [];
+        for(const key in selectors) {
+            const rawValue = selectors[key];
+            const value = rawValue.includes(" ") ? `"${rawValue}"` : rawValue;
+            selectorArray.push(`${key}=${value}`);
+        }
+        return `${selector}[${selectorArray.join(",")}]`;
+    }
+};

src/index.js

@@ -1,10 +1,11 @@
 export * from "./utils/index.js";
 export { Event } from "./event.js";
 export { GameRule } from "./gamerule.js";
-export { Command } from "./command.js";
+export { default as Command } from "./command.js";
 export { World } from "./world.js";
 export { Tick } from "./tick.js";
 export { Tag } from "./tag.js";
 export { Player } from "./player.js";
 export { Scoreboard } from "./scoreboard.js";
 export { EventEmitter } from "./eventEmitter.js";
+export { RawTextBuilder } from "./rawTextBuilder/index.js";

src/rawTextBuilder/components/rawTextComponent.js

@@ -0,0 +1,23 @@
+export default class RawTextComponent {
+    name;
+    #value;
+
+    constructor(value) {
+        this.#value = value;
+    }
+
+    #getValue() {
+        if(this.#value.build === undefined) {
+            return this.#value;
+        }
+        return this.#value.build();
+    }
+
+    get value() {
+        return this.#value;
+    }
+
+    build() {
+        return { [this.name]: this.#getValue() };
+    }
+}

src/rawTextBuilder/components/scoreComponent.js

@@ -0,0 +1,28 @@
+import Base from "./rawTextComponent.js";
+
+
+export default class ScoreComponent extends Base {
+    name = "score";
+
+    #getName() {
+        const { name } = this.value;
+        if(name.build === undefined) {
+            return name;
+        }
+        return name.build();
+    }
+
+    #getScore() {
+        const { objective, value } = this.value;
+        const result = { name: this.#getName(), objective };
+
+        if(value === undefined) {
+            return result;
+        }
+        return { ...result, value };
+    }
+
+    build() {
+        return { [this.name]: this.#getScore() };
+    }
+}

src/rawTextBuilder/components/selectorComponent.js

@@ -0,0 +1,16 @@
+import Base from "./rawTextComponent.js";
+import { SelectorBuilder, Selectors } from "../../selectorBuilder.js";
+
+
+export default class SelectorComponent extends Base{
+    name = "selector";
+
+    constructor(selector) {
+        if(selector instanceof SelectorBuilder ||
+            Object.values(Selectors).includes(selector.toLowerCase())) {
+            super(selector);
+            return;
+        }
+        throw "type error";
+    }
+}

src/rawTextBuilder/components/textComponent.js

@@ -0,0 +1,6 @@
+import Base from "./rawTextComponent.js";
+
+
+export default class TextComponent extends Base {
+    name = "text";
+}

src/rawTextBuilder/components/translateComponent.js

@@ -0,0 +1,23 @@
+import Base from "./rawTextComponent.js";
+
+
+export default class TranslateComponent extends Base {
+    name = "translate";
+
+    #getWith() {
+        return this.value.with.map(value => {
+            if(value instanceof RawTextBuilder) {
+                return value.build();
+            }
+            return value;
+        });
+    }
+
+    build() {
+        const result = { [this.name]: this.value.translate };
+        if(this.value.with <= 0) {
+            return result;
+        }
+        return { ...result, with: this.#getWith() };
+    }
+}

src/rawTextBuilder/index.js

@@ -0,0 +1 @@
+export { default as RawTextBuilder } from "./rawTextBuilder.js";

src/rawTextBuilder/rawTextBuilder.js

@@ -0,0 +1,73 @@
+import ScoreComponent from "./components/scoreComponent.js";
+import SelectorComponent from "./components/selectorComponent.js";
+import TextComponent from "./components/textComponent.js";
+import TranslateComponent from "./components/translateComponent.js";
+
+
+export default class RawTextBuilder {
+    #values = [];
+
+    #add(value) {
+        this.#values.push(value);
+        return this;
+    }
+
+    addScore(name, objective, value) {
+        return this.#add(new ScoreComponent({ name, objective, value }));
+    }
+
+    addSelector(value) {
+        return this.#add(new SelectorComponent(value));
+    }
+
+    addText(text) {
+        return this.#add(new TextComponent(text));
+    }
+
+    addTranslate(translate, ..._with) {
+        return this.#add(new TranslateComponent({translate, with: _with}));
+    }
+
+    #insert(index, value) {
+        this.#values.splice(index, 0, value);
+        return this;
+    }
+
+    insertScore(index, name, objective, value) {
+        return this.#insert(index, new ScoreComponent({ name, objective, value }));
+    }
+
+    insertSelector(index, value) {
+        return this.#insert(index, new SelectorComponent(value));
+    }
+
+    insertText(index, text) {
+        return this.#insert(index, new TextComponent(text));
+    }
+
+    insertTranslate(index, translate, ..._with) {
+        return this.#insert(index, new TranslateComponent({translate, with: _with}));
+    }
+
+    remove(start, removeCount) {
+        this.#values.splice(start, removeCount);
+        return this;
+    }
+
+    reverse() {
+        this.#values = this.#values.reverse();
+        return this;
+    }
+
+    #buildValues() {
+        return this.#values.map(v => v.build());
+    }
+
+    build() {
+        return { rawtext: this.#buildValues() };
+    }
+
+    buildJSON() {
+        return JSON.stringify(this.build());
+    }
+}

src/selectorBuilder.js

@@ -0,0 +1,40 @@
+export const Selectors = {
+    allEntity: "@e",
+    allPlayer: "@a",
+    player: "@p",
+    self: "@s"
+};
+Object.freeze(Selectors);
+
+export class SelectorBuilder {
+    #base;
+    #selectors = [];
+    #isPlayerName = false;
+
+    constructor(base) {
+        const lower = base.toLowerCase();
+        if(!Object.values(Selectors).includes(lower)) {
+            this.#isPlayerName = true;
+            this.#base = base;
+            return
+        }
+        this.#base = lower;
+    }
+
+    #buildSelectors() {
+        if(!this.#selectors.length || this.#isPlayerName) {
+            return "";
+        }
+        const selectors = this.#selectors.map(({ key, value }) => `${key}=${value}`);
+        return `[${selectors.join(",")}]`;
+    }
+
+    add(key, value) {
+        this.#selectors.push({ key, value });
+        return this;
+    }
+
+    build() {
+        return this.#base + this.#buildSelectors();
+    }
+}