Update two tests

CaffeineMC · Jan 17, 2025 · fe35388 · fe35388
1 parent 77315ac
commit fe35388
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/.../data/lithium-gametest/gametest/structure/test_redstone.comparator_update_collection.snbt b/.../data/lithium-gametest/gametest/structure/test_redstone.comparator_update_collection.snbt
@@ -1,5 +1,5 @@
 {
-    DataVersion: 2719,
+    DataVersion: 4189,
     size: [10, 10, 30],
     data: [
         {pos: [0, 0, 0], state: "minecraft:blue_concrete"},
@@ -379,7 +379,7 @@
         {pos: [2, 1, 14], state: "minecraft:air"},
         {pos: [2, 1, 15], state: "minecraft:air"},
         {pos: [2, 1, 16], state: "minecraft:repeater{delay:4,facing:east,locked:false,powered:false}"},
-        {pos: [2, 1, 17], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Count: 16b, Slot: 0b, id: "minecraft:redstone"}, {Count: 8b, Slot: 1b, id: "minecraft:redstone"}, {Count: 4b, Slot: 2b, id: "minecraft:redstone"}, {Count: 2b, Slot: 3b, id: "minecraft:redstone"}, {Count: 2b, Slot: 4b, id: "minecraft:redstone"}], TransferCooldown: 0, id: "minecraft:hopper"}},
+        {pos: [2, 1, 17], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Slot: 0b, count: 16, id: "minecraft:redstone"}, {Slot: 1b, count: 8, id: "minecraft:redstone"}, {Slot: 2b, count: 4, id: "minecraft:redstone"}, {Slot: 3b, count: 2, id: "minecraft:redstone"}, {Slot: 4b, count: 2, id: "minecraft:redstone"}], TransferCooldown: 0, id: "minecraft:hopper"}},
         {pos: [2, 1, 18], state: "minecraft:white_concrete"},
         {pos: [2, 1, 19], state: "minecraft:air"},
         {pos: [2, 1, 20], state: "minecraft:air"},
@@ -430,7 +430,7 @@
         {pos: [4, 1, 5], state: "minecraft:white_concrete"},
         {pos: [4, 1, 6], state: "minecraft:redstone_wall_torch{facing:south,lit:true}"},
         {pos: [4, 1, 7], state: "minecraft:redstone_wire{east:none,north:side,power:15,south:side,west:none}"},
-        {pos: [4, 1, 8], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:redstone"}, {Count: 1b, Slot: 1b, id: "minecraft:redstone"}, {Count: 1b, Slot: 2b, id: "minecraft:redstone"}, {Count: 1b, Slot: 3b, id: "minecraft:redstone"}, {Count: 1b, Slot: 4b, id: "minecraft:redstone"}], TransferCooldown: 0, id: "minecraft:hopper"}},
+        {pos: [4, 1, 8], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Slot: 0b, count: 1, id: "minecraft:redstone"}, {Slot: 1b, count: 1, id: "minecraft:redstone"}, {Slot: 2b, count: 1, id: "minecraft:redstone"}, {Slot: 3b, count: 1, id: "minecraft:redstone"}, {Slot: 4b, count: 1, id: "minecraft:redstone"}], TransferCooldown: 0, id: "minecraft:hopper"}},
         {pos: [4, 1, 9], state: "minecraft:white_concrete"},
         {pos: [4, 1, 10], state: "minecraft:white_concrete"},
         {pos: [4, 1, 11], state: "minecraft:air"},
@@ -439,7 +439,7 @@
         {pos: [4, 1, 14], state: "minecraft:air"},
         {pos: [4, 1, 15], state: "minecraft:air"},
         {pos: [4, 1, 16], state: "minecraft:repeater{delay:4,facing:east,locked:false,powered:false}"},
-        {pos: [4, 1, 17], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Count: 16b, Slot: 0b, id: "minecraft:redstone"}, {Count: 8b, Slot: 1b, id: "minecraft:redstone"}, {Count: 4b, Slot: 2b, id: "minecraft:redstone"}, {Count: 2b, Slot: 3b, id: "minecraft:redstone"}, {Count: 2b, Slot: 4b, id: "minecraft:redstone"}], TransferCooldown: 0, id: "minecraft:hopper"}},
+        {pos: [4, 1, 17], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Slot: 0b, count: 16, id: "minecraft:redstone"}, {Slot: 1b, count: 8, id: "minecraft:redstone"}, {Slot: 2b, count: 4, id: "minecraft:redstone"}, {Slot: 3b, count: 2, id: "minecraft:redstone"}, {Slot: 4b, count: 2, id: "minecraft:redstone"}], TransferCooldown: 0, id: "minecraft:hopper"}},
         {pos: [4, 1, 18], state: "minecraft:white_concrete"},
         {pos: [4, 1, 19], state: "minecraft:air"},
         {pos: [4, 1, 20], state: "minecraft:air"},
@@ -620,7 +620,7 @@
         {pos: [0, 2, 15], state: "minecraft:air"},
         {pos: [0, 2, 16], state: "minecraft:air"},
         {pos: [0, 2, 17], state: "minecraft:air"},
-        {pos: [0, 2, 18], state: "minecraft:air"},
+        {pos: [0, 2, 18], state: "minecraft:note_block{instrument:guitar,note:0,powered:false}"},
         {pos: [0, 2, 19], state: "minecraft:air"},
         {pos: [0, 2, 20], state: "minecraft:air"},
         {pos: [0, 2, 21], state: "minecraft:air"},
@@ -633,7 +633,7 @@
         {pos: [0, 2, 28], state: "minecraft:air"},
         {pos: [0, 2, 29], state: "minecraft:air"},
         {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:hopper{enabled:false,facing:east}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:golden_axe", tag: {Damage: 0}}], TransferCooldown: 0, id: "minecraft:hopper"}},
+        {pos: [1, 2, 1], state: "minecraft:hopper{enabled:false,facing:east}", nbt: {Items: [{Slot: 0b, count: 1, id: "minecraft:golden_axe"}], TransferCooldown: 0, id: "minecraft:hopper"}},
         {pos: [1, 2, 2], state: "minecraft:air"},
         {pos: [1, 2, 3], state: "minecraft:air"},
         {pos: [1, 2, 4], state: "minecraft:air"},
@@ -679,7 +679,7 @@
         {pos: [2, 2, 14], state: "minecraft:air"},
         {pos: [2, 2, 15], state: "minecraft:air"},
         {pos: [2, 2, 16], state: "minecraft:air"},
-        {pos: [2, 2, 17], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:golden_axe", tag: {Damage: 0}}], id: "minecraft:chest"}},
+        {pos: [2, 2, 17], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [{Slot: 0b, count: 1, id: "minecraft:golden_axe"}], id: "minecraft:chest"}},
         {pos: [2, 2, 18], state: "minecraft:comparator{facing:north,mode:compare,powered:true}", nbt: {OutputSignal: 1, id: "minecraft:comparator"}},
         {pos: [2, 2, 19], state: "minecraft:air"},
         {pos: [2, 2, 20], state: "minecraft:piston{extended:false,facing:south}"},
@@ -702,7 +702,7 @@
         {pos: [3, 2, 7], state: "minecraft:air"},
         {pos: [3, 2, 8], state: "minecraft:air"},
         {pos: [3, 2, 9], state: "minecraft:air"},
-        {pos: [3, 2, 10], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:golden_axe", tag: {Damage: 0}}, {Count: 1b, Slot: 1b, id: "minecraft:golden_axe", tag: {Damage: 0}}, {Count: 1b, Slot: 2b, id: "minecraft:golden_axe", tag: {Damage: 0}}], id: "minecraft:chest"}},
+        {pos: [3, 2, 10], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [{Slot: 0b, count: 1, id: "minecraft:golden_axe"}, {Slot: 1b, count: 1, id: "minecraft:golden_axe"}, {Slot: 2b, count: 1, id: "minecraft:golden_axe"}], id: "minecraft:chest"}},
         {pos: [3, 2, 11], state: "minecraft:air"},
         {pos: [3, 2, 12], state: "minecraft:air"},
         {pos: [3, 2, 13], state: "minecraft:air"},
@@ -730,7 +730,7 @@
         {pos: [4, 2, 5], state: "minecraft:redstone_wire{east:side,north:none,power:0,south:none,west:side}"},
         {pos: [4, 2, 6], state: "minecraft:air"},
         {pos: [4, 2, 7], state: "minecraft:air"},
-        {pos: [4, 2, 8], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:oak_sign"}, {Count: 1b, Slot: 1b, id: "minecraft:golden_axe", tag: {Damage: 0}}, {Count: 1b, Slot: 2b, id: "minecraft:golden_axe", tag: {Damage: 0}}], id: "minecraft:chest"}},
+        {pos: [4, 2, 8], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [{Slot: 0b, count: 1, id: "minecraft:oak_sign"}, {Slot: 1b, count: 1, id: "minecraft:golden_axe"}, {Slot: 2b, count: 1, id: "minecraft:golden_axe"}], id: "minecraft:chest"}},
         {pos: [4, 2, 9], state: "minecraft:white_concrete"},
         {pos: [4, 2, 10], state: "minecraft:comparator{facing:west,mode:compare,powered:true}", nbt: {OutputSignal: 2, id: "minecraft:comparator"}},
         {pos: [4, 2, 11], state: "minecraft:air"},
@@ -739,7 +739,7 @@
         {pos: [4, 2, 14], state: "minecraft:air"},
         {pos: [4, 2, 15], state: "minecraft:air"},
         {pos: [4, 2, 16], state: "minecraft:air"},
-        {pos: [4, 2, 17], state: "minecraft:chest{facing:south,type:single,waterlogged:false}", nbt: {Items: [{Count: 64b, Slot: 0b, id: "minecraft:smooth_stone_slab"}], id: "minecraft:chest"}},
+        {pos: [4, 2, 17], state: "minecraft:chest{facing:south,type:single,waterlogged:false}", nbt: {Items: [{Slot: 0b, count: 64, id: "minecraft:smooth_stone_slab"}], id: "minecraft:chest"}},
         {pos: [4, 2, 18], state: "minecraft:comparator{facing:north,mode:compare,powered:true}", nbt: {OutputSignal: 1, id: "minecraft:comparator"}},
         {pos: [4, 2, 19], state: "minecraft:air"},
         {pos: [4, 2, 20], state: "minecraft:piston{extended:false,facing:south}"},
@@ -804,7 +804,7 @@
         {pos: [6, 2, 19], state: "minecraft:air"},
         {pos: [6, 2, 20], state: "minecraft:air"},
         {pos: [6, 2, 21], state: "minecraft:air"},
-        {pos: [6, 2, 22], state: "minecraft:air"},
+        {pos: [6, 2, 22], state: "minecraft:note_block{instrument:guitar,note:0,powered:false}"},
         {pos: [6, 2, 23], state: "minecraft:air"},
         {pos: [6, 2, 24], state: "minecraft:air"},
         {pos: [6, 2, 25], state: "minecraft:air"},
@@ -819,7 +819,7 @@
         {pos: [7, 2, 4], state: "minecraft:air"},
         {pos: [7, 2, 5], state: "minecraft:air"},
         {pos: [7, 2, 6], state: "minecraft:air"},
-        {pos: [7, 2, 7], state: "minecraft:chest{facing:south,type:single,waterlogged:false}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:golden_axe", tag: {Damage: 0}}, {Count: 1b, Slot: 1b, id: "minecraft:golden_axe", tag: {Damage: 0}}, {Count: 1b, Slot: 2b, id: "minecraft:golden_axe", tag: {Damage: 0}}], id: "minecraft:chest"}},
+        {pos: [7, 2, 7], state: "minecraft:chest{facing:south,type:single,waterlogged:false}", nbt: {Items: [{Slot: 0b, count: 1, id: "minecraft:golden_axe"}, {Slot: 1b, count: 1, id: "minecraft:golden_axe"}, {Slot: 2b, count: 1, id: "minecraft:golden_axe"}], id: "minecraft:chest"}},
         {pos: [7, 2, 8], state: "minecraft:comparator{facing:north,mode:compare,powered:true}", nbt: {OutputSignal: 2, id: "minecraft:comparator"}},
         {pos: [7, 2, 9], state: "minecraft:white_concrete"},
         {pos: [7, 2, 10], state: "minecraft:air"},
@@ -1115,7 +1115,7 @@
         {pos: [7, 3, 0], state: "minecraft:air"},
         {pos: [7, 3, 1], state: "minecraft:air"},
         {pos: [7, 3, 2], state: "minecraft:air"},
-        {pos: [7, 3, 3], state: "minecraft:air"},
+        {pos: [7, 3, 3], state: "minecraft:note_block{instrument:guitar,note:0,powered:false}"},
         {pos: [7, 3, 4], state: "minecraft:air"},
         {pos: [7, 3, 5], state: "minecraft:air"},
         {pos: [7, 3, 6], state: "minecraft:air"},
@@ -1284,7 +1284,7 @@
         {pos: [2, 4, 19], state: "minecraft:air"},
         {pos: [2, 4, 20], state: "minecraft:air"},
         {pos: [2, 4, 21], state: "minecraft:air"},
-        {pos: [2, 4, 22], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "fill ~ ~ ~ ~ ~-1 ~ air", CustomName: '{"text":"@"}', SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 1b, id: "minecraft:command_block", powered: 0b}},
+        {pos: [2, 4, 22], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "fill ~ ~ ~ ~ ~-1 ~ air", CustomName: '"@"', SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 1b, id: "minecraft:command_block", powered: 0b}},
         {pos: [2, 4, 23], state: "minecraft:air"},
         {pos: [2, 4, 24], state: "minecraft:air"},
         {pos: [2, 4, 25], state: "minecraft:air"},
@@ -1344,7 +1344,7 @@
         {pos: [4, 4, 19], state: "minecraft:air"},
         {pos: [4, 4, 20], state: "minecraft:air"},
         {pos: [4, 4, 21], state: "minecraft:air"},
-        {pos: [4, 4, 22], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "fill ~ ~ ~ ~ ~-1 ~ air", CustomName: '{"text":"@"}', SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 1b, id: "minecraft:command_block", powered: 0b}},
+        {pos: [4, 4, 22], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "fill ~ ~ ~ ~ ~-1 ~ air", CustomName: '"@"', SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 1b, id: "minecraft:command_block", powered: 0b}},
         {pos: [4, 4, 23], state: "minecraft:air"},
         {pos: [4, 4, 24], state: "minecraft:air"},
         {pos: [4, 4, 25], state: "minecraft:air"},
@@ -1729,7 +1729,7 @@
         {pos: [7, 5, 14], state: "minecraft:air"},
         {pos: [7, 5, 15], state: "minecraft:air"},
         {pos: [7, 5, 16], state: "minecraft:air"},
-        {pos: [7, 5, 17], state: "minecraft:air"},
+        {pos: [7, 5, 17], state: "minecraft:note_block{instrument:guitar,note:0,powered:false}"},
         {pos: [7, 5, 18], state: "minecraft:air"},
         {pos: [7, 5, 19], state: "minecraft:air"},
         {pos: [7, 5, 20], state: "minecraft:air"},
@@ -2019,7 +2019,7 @@
         {pos: [7, 6, 4], state: "minecraft:air"},
         {pos: [7, 6, 5], state: "minecraft:air"},
         {pos: [7, 6, 6], state: "minecraft:air"},
-        {pos: [7, 6, 7], state: "minecraft:air"},
+        {pos: [7, 6, 7], state: "minecraft:note_block{instrument:guitar,note:0,powered:false}"},
         {pos: [7, 6, 8], state: "minecraft:air"},
         {pos: [7, 6, 9], state: "minecraft:air"},
         {pos: [7, 6, 10], state: "minecraft:air"},
@@ -3012,6 +3012,7 @@
         "minecraft:piston{extended:false,facing:north}",
         "minecraft:redstone_block",
         "minecraft:emerald_block",
+        "minecraft:note_block{instrument:guitar,note:0,powered:false}",
         "minecraft:piston{extended:false,facing:south}",
         "minecraft:slime_block",
         "minecraft:sticky_piston{extended:false,facing:east}",

diff --git a/...ources/data/lithium-gametest/gametest/structure/test_redstone.moving_block_collision.snbt b/...ources/data/lithium-gametest/gametest/structure/test_redstone.moving_block_collision.snbt
@@ -1,5 +1,5 @@
 {
-    DataVersion: 3465,
+    DataVersion: 4189,
     size: [5, 5, 5],
     data: [
         {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
@@ -42,9 +42,9 @@
         {pos: [2, 1, 2], state: "minecraft:redstone_wire{east:side,north:none,power:0,south:side,west:side}"},
         {pos: [2, 1, 3], state: "minecraft:stone_pressure_plate{powered:false}"},
         {pos: [2, 1, 4], state: "minecraft:repeater{delay:4,facing:east,locked:false,powered:false}"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:redstone_wire{east:side,north:none,power:0,south:side,west:side}"},
+        {pos: [3, 1, 0], state: "minecraft:red_wool"},
+        {pos: [3, 1, 1], state: "minecraft:repeater{delay:1,facing:south,locked:false,powered:false}"},
+        {pos: [3, 1, 2], state: "minecraft:redstone_wire{east:side,north:side,power:0,south:side,west:side}"},
         {pos: [3, 1, 3], state: "minecraft:stone_pressure_plate{powered:false}"},
         {pos: [3, 1, 4], state: "minecraft:repeater{delay:4,facing:east,locked:false,powered:false}"},
         {pos: [4, 1, 0], state: "minecraft:air"},
@@ -67,7 +67,7 @@
         {pos: [2, 2, 2], state: "minecraft:air"},
         {pos: [2, 2, 3], state: "minecraft:dirt_path"},
         {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
+        {pos: [3, 2, 0], state: "minecraft:note_block{instrument:guitar,note:0,powered:false}"},
         {pos: [3, 2, 1], state: "minecraft:air"},
         {pos: [3, 2, 2], state: "minecraft:air"},
         {pos: [3, 2, 3], state: "minecraft:dirt_path"},
@@ -120,31 +120,34 @@
         {pos: [3, 4, 0], state: "minecraft:air"},
         {pos: [3, 4, 1], state: "minecraft:air"},
         {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
+        {pos: [3, 4, 3], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "summon minecraft:armor_stand", SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 0b, id: "minecraft:command_block", powered: 0b}},
+        {pos: [3, 4, 4], state: "minecraft:red_terracotta"},
         {pos: [4, 4, 0], state: "minecraft:air"},
         {pos: [4, 4, 1], state: "minecraft:air"},
         {pos: [4, 4, 2], state: "minecraft:air"},
         {pos: [4, 4, 3], state: "minecraft:air"},
         {pos: [4, 4, 4], state: "minecraft:air"}
     ],
-    entities: [
-        {blockPos: [3, 2, 3], pos: [3.5d, 2.9375d, 3.5d], nbt: {AbsorptionAmount: 0.0f, Air: 300s, ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.699999988079071d, Name: "minecraft:generic.movement_speed"}], Brain: {memories: {}}, DeathTime: 0s, DisabledSlots: 0, FallDistance: 0.0f, FallFlying: 0b, Fire: -1s, HandItems: [{}, {}], Health: 20.0f, HurtByTimestamp: 0, HurtTime: 0s, Invisible: 0b, Invulnerable: 0b, Motion: [0.0d, -0.0784000015258789d, 0.0d], NoBasePlate: 0b, OnGround: 1b, PortalCooldown: 0, Pos: [115.5d, -60.0625d, 3060.5d], Pose: {}, Rotation: [-180.0f, 0.0f], ShowArms: 0b, Small: 0b, UUID: [I; 385864073, -1784135466, -1772967866, -1524765269], id: "minecraft:armor_stand"}}
-    ],
+    entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:emerald_block",
         "minecraft:white_concrete",
+        "minecraft:red_wool",
         "minecraft:red_terracotta",
         "minecraft:note_block{instrument:bit,note:0,powered:false}",
         "minecraft:piston{extended:false,facing:east}",
+        "minecraft:note_block{instrument:guitar,note:0,powered:false}",
         "minecraft:air",
         "minecraft:repeater{delay:4,facing:south,locked:false,powered:false}",
         "minecraft:repeater{delay:1,facing:east,locked:false,powered:false}",
         "minecraft:repeater{delay:4,facing:east,locked:false,powered:false}",
         "minecraft:redstone_wire{east:side,north:none,power:0,south:side,west:side}",
         "minecraft:stone_pressure_plate{powered:false}",
+        "minecraft:repeater{delay:1,facing:south,locked:false,powered:false}",
+        "minecraft:redstone_wire{east:side,north:side,power:0,south:side,west:side}",
         "minecraft:redstone_wire{east:none,north:none,power:0,south:side,west:side}",
-        "minecraft:dirt_path"
+        "minecraft:dirt_path",
+        "minecraft:command_block{conditional:false,facing:up}"
     ]
 }