Fix stupid minecraft

2024-08-05 13:31:08 +02:00
parent 7259b53176
commit cd5f473460
24 changed files with 7208 additions and 156 deletions
--- a/scripts/levelConditions/level1.ts
+++ b/scripts/levelConditions/level1.ts
@@ -1,91 +1,92 @@
-import { BlockType, MinecraftBlockTypes, Vector3 } from "@minecraft/server";
+import { BlockType, Vector3 } from "@minecraft/server";
 import { LevelBlockCondition, LevelNoGoZone } from "../Commandeer/level/levelTypes";
 import { vector3 } from "../Commandeer/utils/vectorUtils";
+import { MinecraftBlockTypes } from "../vanilla-data/mojang-block";

 let level1Conditions: LevelBlockCondition = {
  conditions: [
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(55, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(56, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(57, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(58, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(59, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(61, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(62, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(63, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(65, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(66, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(67, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(69, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(70, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(71, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(72, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(73, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(74, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(74, 70, 216),
    },
  ],
--- a/scripts/levelConditions/level2.ts
+++ b/scripts/levelConditions/level2.ts
@@ -1,141 +1,142 @@
-import { BlockType, MinecraftBlockTypes, Vector3 } from "@minecraft/server";
+import { BlockType, Vector3 } from "@minecraft/server";
 import { LevelBlockCondition, LevelNoGoZone } from "../Commandeer/level/levelTypes";
 import { vector3 } from "../Commandeer/utils/vectorUtils";
+import { MinecraftBlockTypes } from "../vanilla-data/mojang-block";

 let level2Conditions: LevelBlockCondition = {
  conditions: [
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(45, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(44, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(43, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(42, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(41, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(40, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(39, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(38, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(37, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(36, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(35, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(34, 70, 220),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 220),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 219),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 218),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 217),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 216),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 215),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 214),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 213),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(33, 70, 212),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(34, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(35, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(36, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(37, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(38, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(39, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(40, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(41, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(42, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(43, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(44, 70, 212),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(45, 70, 212),
    },
  ],
--- a/scripts/levelConditions/level3.ts
+++ b/scripts/levelConditions/level3.ts
@@ -1,136 +1,137 @@
-import { BlockType, MinecraftBlockTypes, Vector3 } from "@minecraft/server";
+import { BlockType, Vector3 } from "@minecraft/server";
 import { LevelBlockCondition } from "../Commandeer/level/levelTypes";
 import { vector3 } from "../Commandeer/utils/vectorUtils";
+import { MinecraftBlockTypes } from "../vanilla-data/mojang-block";

 let level3Conditions: LevelBlockCondition = {
  conditions: [
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(57, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(58, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(59, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 234),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 233),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 232),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 231),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(61, 70, 231),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(62, 70, 231),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(63, 70, 231),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 231),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 232),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 233),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 234),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 236),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 237),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 238),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 239),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(65, 70, 239),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(66, 70, 239),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(67, 70, 239),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 239),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 238),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 237),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 236),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 235),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(69, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(70, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(71, 70, 235),
    },
  ],
--- a/scripts/levelConditions/level4.ts
+++ b/scripts/levelConditions/level4.ts
@@ -1,136 +1,137 @@
-import { BlockType, MinecraftBlockTypes, Vector3 } from "@minecraft/server";
+import { BlockType, Vector3 } from "@minecraft/server";
 import { LevelBlockCondition } from "../Commandeer/level/levelTypes";
 import { vector3 } from "../Commandeer/utils/vectorUtils";
+import { MinecraftBlockTypes } from "../vanilla-data/mojang-block";

 let level3Conditions: LevelBlockCondition = {
  conditions: [
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(57, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(58, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(59, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 234),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 233),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 232),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(60, 70, 231),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(61, 70, 231),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(62, 70, 231),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(63, 70, 231),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 231),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 232),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 233),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 234),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 236),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 237),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 238),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(64, 70, 239),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(65, 70, 239),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(66, 70, 239),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(67, 70, 239),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 239),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 238),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 237),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 236),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(68, 70, 235),
    },

    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(69, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(70, 70, 235),
    },
    {
-      block: MinecraftBlockTypes.air,
+      block: MinecraftBlockTypes.Air,
      position: vector3(71, 70, 235),
    },
  ],
--- a/scripts/levelConditions/levelIntro.ts
+++ b/scripts/levelConditions/levelIntro.ts
@@ -1,23 +1,23 @@
-import { MinecraftBlockTypes } from "@minecraft/server";
 import { LevelBlockCondition, LevelLeverCondition } from "../Commandeer/level/levelTypes";
 import { vector3 } from "../Commandeer/utils/vectorUtils";
+import { MinecraftBlockTypes } from "../vanilla-data/mojang-block";

 let levelIntroConditions: LevelBlockCondition = {
  conditions: [
    {
-      block: MinecraftBlockTypes.emeraldBlock,
+      block: MinecraftBlockTypes.EmeraldBlock,
      position: vector3(2471, 12, 108),
    },
    {
-      block: MinecraftBlockTypes.emeraldBlock,
+      block: MinecraftBlockTypes.EmeraldBlock,
      position: vector3(2469, 12, 108),
    },
    {
-      block: MinecraftBlockTypes.lapisBlock,
+      block: MinecraftBlockTypes.LapisBlock,
      position: vector3(2468, 12, 108),
    },
    {
-      block: MinecraftBlockTypes.lapisBlock,
+      block: MinecraftBlockTypes.LapisBlock,
      position: vector3(2464, 12, 108),
    },
  ],