2.6.5

Moved lots of files around, fixed bugs with database

.gitignore

@@ -3,8 +3,6 @@ node_modules
 .tsconfig.json
 .gitignore
 
-build.js
-
 scripts/*
 !scripts/index.js
 !scripts/index.js.map

build.js

@@ -9,25 +9,27 @@ if (!fsExtra.existsSync(dir)) {
 }
 fsExtra.emptyDirSync(dir);
 
-esbuild.build({
-  entryPoints: ["src/index.ts"],
-  bundle: true,
-  outfile: "scripts/index.js",
-  minify: !isDev,
-  platform: "neutral",
-  sourcemap: true,
-  watch: isDev,
-  external: [
-    "@minecraft/server",
-    "@minecraft/server-ui",
-    "@minecraft/server-net",
-    "@minecraft/server-admin",
-  ],
-  legalComments: isDev ? "none" : "none",
-}).then((r) => {
-  console.log(
-    `\x1b[33m%s\x1b[0m`,
-    `[${new Date().toLocaleTimeString()}]`,
-    `Built for ${isDev ? "development" : "production"}...`
-  );
-})
+esbuild
+  .build({
+    entryPoints: ["src/index.ts"],
+    bundle: true,
+    outfile: "scripts/index.js",
+    minify: !isDev,
+    platform: "neutral",
+    sourcemap: true,
+    watch: isDev,
+    external: [
+      "@minecraft/server",
+      "@minecraft/server-ui",
+      "@minecraft/server-net",
+      "@minecraft/server-admin",
+    ],
+    legalComments: isDev ? "none" : "none",
+  })
+  .then((r) => {
+    console.log(
+      `\x1b[33m%s\x1b[0m`,
+      `[${new Date().toLocaleTimeString()}]`,
+      `Built for ${isDev ? "development" : "production"}...`
+    );
+  });

src/index.ts

@@ -1,20 +1,11 @@
-console.warn(`---- STARTING RUBEDO ----`);
-import {
-  ItemStack,
-  MinecraftItemTypes,
-  system,
-} from "@minecraft/server";
-import "./lib/Command/index";
-import "./lib/Chest GUI/index";
-import "./plugins/import";
-import "./database/index";
+import { system } from "@minecraft/server";
+import "./rubedo/lib/Command/index";
+import "./rubedo/lib/Chest GUI/index";
+import "./rubedo/database/index";
+import "./rubedo/lib/Containers/index";
+import "./vendor/import";
 
 system.events.beforeWatchdogTerminate.subscribe((data) => {
   data.cancel = true;
   console.warn(`WATCHDOG TRIED TO CRASH = ${data.terminateReason}`);
 });
-
-/**
- * This is air as a item,
- */
-export const AIR = new ItemStack(MinecraftItemTypes.stick, 0);

src/config/app.ts → src/rubedo/config/app.ts

@@ -19,15 +19,3 @@ export const VERSION = "2.6.4-beta";
 |
 */
 export const GAME_VERSION = "1.19.50";
-
-/*
-|--------------------------------------------------------------------------
-| Appeal Link
-|--------------------------------------------------------------------------
-|
-| This is the appeal link that gets showed when someone gets banned
-| this link pops up at the bottom of the ban message to show
-| where they can appeal there ban.
-|
-*/
-export const APPEAL_LINK = "https://discord.gg/dMa3A5UYKX";

src/rubedo/config/containers.ts

@@ -0,0 +1,14 @@
+import { MinecraftBlockTypes } from "@minecraft/server";
+
+/**
+ * The currently supported block containers by script api
+ */
+export const API_CONTAINERS = [
+  MinecraftBlockTypes.chest.id,
+  MinecraftBlockTypes.trappedChest.id,
+];
+
+/**
+ * The block size to check for blockContainers
+ */
+export const CHECK_SIZE = { x: 7, y: 7, z: 7 };

src/database/Database.ts → src/rubedo/database/Database.ts

@@ -6,8 +6,7 @@ import {
   MAX_DATABASE_STRING_SIZE,
 } from "../config/database";
 import { EntitiesLoad } from "../lib/Events/EntitiesLoad";
-import { DIMENSIONS } from "../utils";
-import { chunkString } from "../utils";
+import { DIMENSIONS, chunkString } from "../../utils";
 
 export class Database<Key extends string = string, Value = {}> {
   /**
@@ -99,28 +98,26 @@ export class Database<Key extends string = string, Value = {}> {
         entities.push(Database.createTableEntity(this.tableName));
       }
     }
+
+    let chunkIndex = 0;
     for (const [i, entity] of entities.entries()) {
       const inventory = entity.getComponent("inventory").container;
-      for (const [i, chunk] of chunks.entries()) {
-        if (!chunk) continue;
-        if (i > inventory.size - 1) break; // Exit because it has maxed items
+      while (chunkIndex < chunks.length && inventory.size > 0) {
         let item = new ItemStack(MinecraftItemTypes.acaciaBoat);
-        item.nameTag = chunk;
+        item.nameTag = chunks[chunkIndex];
         inventory.setItem(i, item);
-        chunks[i] = null; // Delete chunk because its been set.
+        chunkIndex++;
       }
       // Set all unUsed slots to air
-      for (let i = chunks.length + 1; i < inventory.size; i++) {
+      for (let i = inventory.size; i < INVENTORY_SIZE; i++) {
         inventory.setItem(i, new ItemStack(MinecraftItemTypes.stick, 0));
       }
       entity.setDynamicProperty("index", i);
-      entities[i] = null; // Set this entity to null because its maxed out!
-      // If all chunks have been saved no need to go to next entity
-      if (!chunks.find((v) => v)) break;
     }
     // Check for unUsed entities and despawn them
-    entities.filter((e) => e).forEach((e) => e.triggerEvent("despawn"));
-    return;
+    for (let i = entities.length - 1; i >= chunkIndex / INVENTORY_SIZE; i--) {
+      entities[i].triggerEvent("despawn");
+    }
   }
 
   /**
@@ -286,6 +283,6 @@ export class Database<Key extends string = string, Value = {}> {
    */
   async clear(): Promise<void> {
     this.MEMORY = {} as { [key in Key]: Value };
-    return await this.saveData();
+    return this.saveData();
   }
 }

src/database/index.ts → src/rubedo/database/index.ts

@@ -4,7 +4,7 @@ import {
   world,
 } from "@minecraft/server";
 import { ENTITY_IDENTIFIER, ENTITY_LOCATION } from "../config/database";
-import { DIMENSIONS } from "../utils.js";
+import { DIMENSIONS } from "../../utils.js";
 
 world.events.worldInitialize.subscribe(({ propertyRegistry }) => {
   /**

src/lib/Chest GUI/database/Item.ts → src/rubedo/database/types/Item.ts

@@ -3,22 +3,10 @@ import {
   InventoryComponentContainer,
   ItemStack,
   Location,
+  MinecraftItemTypes,
 } from "@minecraft/server";
-import { AIR } from "../../../index.js";
 import { DIMENSIONS } from "../../../utils.js";
 
-/**
- * Minecraft Bedrock Item Database
- * @license MIT
- * @author Smell of curry
- * @version 1.0.0
- * --------------------------------------------------------------------------
- * Stores items in a database. This works by having a custom entity at a
- * location then it grabs that entity and ads items to it inventory
- * each item in the inventory is then stored in a scoreboard DB to find it
- * --------------------------------------------------------------------------
- */
-
 /**
  * Where the entity is going to be at
  */
@@ -131,7 +119,7 @@ export class ItemDatabase {
       for (let i = 0; i < inv.size; i++) {
         const item = inv.getItem(i);
         if (!item || !item.getLore().includes(id)) continue;
-        inv.setItem(i, AIR);
+        inv.setItem(i, new ItemStack(MinecraftItemTypes.acaciaBoat, 0));
         return true;
       }
     }

src/lib/Chest GUI/Models/EntityChest.ts → src/rubedo/lib/Chest GUI/Models/EntityChest.ts

@@ -1,5 +1,5 @@
 import { Entity, Player, system } from "@minecraft/server";
-import { AIR } from "../../../index.js";
+import { AIR } from "../index";
 import { ENTITY_INVENTORY } from "../../../config/chest";
 import {
   ISlotChangeReturn,

src/lib/Chest GUI/Models/FillTypes.ts → src/rubedo/lib/Chest GUI/Models/FillTypes.ts

@@ -1,5 +1,5 @@
 import { Entity } from "@minecraft/server";
-import { AIR } from "../../../index.js";
+import { AIR } from "../index";
 import { Page } from "./Page.js";
 
 export type FillTypeCallback = (

src/lib/Chest GUI/Models/ItemGrabbedCallback.ts → src/rubedo/lib/Chest GUI/Models/ItemGrabbedCallback.ts

@@ -8,10 +8,10 @@ import {
 } from "@minecraft/server-ui";
 import { ChestGUI } from "./EntityChest";
 import { ItemStack } from "@minecraft/server";
-import { ItemDatabase } from "../database/Item";
 import type { ISlot } from "./Page";
 import type { ISlotChangeReturn } from "../../Events/onSlotChange";
-import { sleep } from "../../../utils";
+import { sleep } from "../../../../utils";
+import { ItemDatabase } from "../../../database/types/Item";
 
 type FormActionReturn<T> = T extends ActionFormData
   ? Promise<ActionFormResponse>

src/lib/Chest GUI/index.ts → src/rubedo/lib/Chest GUI/index.ts

@@ -1,11 +1,18 @@
-import { system, world } from "@minecraft/server";
+import {
+  ItemStack,
+  MinecraftItemTypes,
+  system,
+  world,
+} from "@minecraft/server";
 import { ENTITY_INVENTORY, GUI_ITEM } from "../../config/chest";
-import { getRole } from "../../plugins/Anti-Cheat/utils.js";
 import { ChestGUI } from "./Models/EntityChest";
 import { CHESTGUIS, getHeldItem } from "./utils.js";
 import "./pages/home";
-import { DIMENSIONS } from "../../utils.js";
+import { DIMENSIONS } from "../../../utils.js";
 import { EntitiesLoad } from "../Events/EntitiesLoad";
+import { getRole } from "../../../vendor/Anti-Cheat/utils";
+
+export const AIR = new ItemStack(MinecraftItemTypes.acaciaBoat, 0);
 
 EntitiesLoad.subscribe(() => {
   system.runSchedule(() => {

src/lib/Command/ArgumentTypes.ts → src/rubedo/lib/Command/ArgumentTypes.ts

@@ -1,5 +1,5 @@
 import { Player, world } from "@minecraft/server";
-import { TABLES } from "../../database/tables";
+import { Database } from "../../database/Database";
 
 /**
  * Fetch an online players data
@@ -232,7 +232,8 @@ export class PlayerNameArgumentType implements IArgumentType {
   type: string;
   typeName = "playerName";
   matches(value: string): IArgumentReturnData<string> {
-    const player = TABLES.ids.get(value);
+    const db = new Database<string, string>("ids");
+    const player = db.get(value);
     return {
       success: player ? true : false,
       value: value,

src/lib/Command/types.d.ts → src/rubedo/lib/Command/types.ts

@@ -1,5 +1,4 @@
 import { Player } from "@minecraft/server";
-import type { ROLES } from "../../types";
 import type { Command } from "./Command";
 
 export interface ICommandData {

src/plugins/Anti-Cheat/modules/models/BlockInventory.ts → src/rubedo/lib/Containers/Container.ts

@@ -1,6 +1,6 @@
 import { BlockInventoryComponentContainer, ItemStack } from "@minecraft/server";
 
-export class BlockInventory {
+export class Container {
   emptySlotsCount: number;
   size: number;
   items: Array<ItemStack>;