diff --git a/test/minecraft/TestAdvancements.py b/test/minecraft/TestAdvancements.py index baacb259..249e4c88 100644 --- a/test/minecraft/TestAdvancements.py +++ b/test/minecraft/TestAdvancements.py @@ -8,60 +8,59 @@ class TestAdvancements(TestMinecraft): def test_42000(self): self.run_location_tests([ ["Who is Cutting Onions?", False, []], - ["Who is Cutting Onions?", False, [], ['Ingot Crafting']], + ["Who is Cutting Onions?", False, [], ['Progressive Resource Crafting']], ["Who is Cutting Onions?", False, [], ['Flint and Steel']], ["Who is Cutting Onions?", False, [], ['Progressive Tools']], ["Who is Cutting Onions?", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Who is Cutting Onions?", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], - ["Who is Cutting Onions?", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], + ["Who is Cutting Onions?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Who is Cutting Onions?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42001(self): self.run_location_tests([ ["Oh Shiny", False, []], - ["Oh Shiny", False, [], ['Ingot Crafting']], + ["Oh Shiny", False, [], ['Progressive Resource Crafting']], ["Oh Shiny", False, [], ['Flint and Steel']], ["Oh Shiny", False, [], ['Progressive Tools']], ["Oh Shiny", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Oh Shiny", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], - ["Oh Shiny", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], + ["Oh Shiny", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Oh Shiny", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42002(self): self.run_location_tests([ ["Suit Up", False, []], ["Suit Up", False, [], ["Progressive Armor"]], - ["Suit Up", False, [], ["Ingot Crafting"]], + ["Suit Up", False, [], ["Progressive Resource Crafting"]], ["Suit Up", False, [], ["Progressive Tools"]], - ["Suit Up", True, ["Progressive Armor", "Ingot Crafting", "Progressive Tools"]], + ["Suit Up", True, ["Progressive Armor", "Progressive Resource Crafting", "Progressive Tools"]], ]) def test_42003(self): self.run_location_tests([ ["Very Very Frightening", False, []], ["Very Very Frightening", False, [], ['Channeling Book']], - ["Very Very Frightening", False, [], ['Resource Blocks']], - ["Very Very Frightening", False, [], ['Ingot Crafting']], + ["Very Very Frightening", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Very Very Frightening", False, [], ['Enchanting']], ["Very Very Frightening", False, [], ['Progressive Tools']], ["Very Very Frightening", False, [], ['Progressive Weapons']], ["Very Very Frightening", True, ['Progressive Weapons', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', - 'Enchanting', 'Ingot Crafting', 'Resource Blocks', 'Channeling Book']], + 'Enchanting', 'Progressive Resource Crafting', 'Progressive Resource Crafting', 'Channeling Book']], ]) def test_42004(self): self.run_location_tests([ ["Hot Stuff", False, []], ["Hot Stuff", False, [], ["Bucket"]], - ["Hot Stuff", False, [], ["Ingot Crafting"]], + ["Hot Stuff", False, [], ["Progressive Resource Crafting"]], ["Hot Stuff", False, [], ["Progressive Tools"]], - ["Hot Stuff", True, ["Bucket", "Ingot Crafting", "Progressive Tools"]], + ["Hot Stuff", True, ["Bucket", "Progressive Resource Crafting", "Progressive Tools"]], ]) def test_42005(self): self.run_location_tests([ ["Free the End", False, []], - ["Free the End", False, [], ['Ingot Crafting']], + ["Free the End", False, [], ['Progressive Resource Crafting']], ["Free the End", False, [], ['Flint and Steel']], ["Free the End", False, [], ['Progressive Tools']], ["Free the End", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], @@ -70,10 +69,10 @@ class TestAdvancements(TestMinecraft): ["Free the End", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Free the End", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], ["Free the End", False, [], ['Archery']], - ["Free the End", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Free the End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Free the End", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Free the End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -81,7 +80,7 @@ class TestAdvancements(TestMinecraft): def test_42006(self): self.run_location_tests([ ["A Furious Cocktail", False, []], - ["A Furious Cocktail", False, [], ['Ingot Crafting']], + ["A Furious Cocktail", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["A Furious Cocktail", False, [], ['Flint and Steel']], ["A Furious Cocktail", False, [], ['Progressive Tools']], ["A Furious Cocktail", False, [], ['Progressive Weapons']], @@ -90,18 +89,11 @@ class TestAdvancements(TestMinecraft): ["A Furious Cocktail", False, [], ['Bottles']], ["A Furious Cocktail", False, [], ['Fishing Rod']], ["A Furious Cocktail", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["A Furious Cocktail", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["A Furious Cocktail", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', - 'Enchanting', 'Brewing', 'Bottles', 'Resource Blocks', 'Fishing Rod']], - # ["A Furious Cocktail", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - # 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles', 'Fishing Rod']], - # ["A Furious Cocktail", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - # 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles', 'Fishing Rod']], - # ["A Furious Cocktail", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - # 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles', 'Fishing Rod']], - # ["A Furious Cocktail", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - # 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles', 'Fishing Rod']], + 'Enchanting', 'Brewing', 'Bottles', 'Fishing Rod']], ]) def test_42007(self): @@ -112,7 +104,7 @@ class TestAdvancements(TestMinecraft): def test_42008(self): self.run_location_tests([ ["Bring Home the Beacon", False, []], - ["Bring Home the Beacon", False, [], ['Ingot Crafting']], + ["Bring Home the Beacon", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Bring Home the Beacon", False, [], ['Flint and Steel']], ["Bring Home the Beacon", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["Bring Home the Beacon", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], @@ -120,21 +112,21 @@ class TestAdvancements(TestMinecraft): ["Bring Home the Beacon", False, [], ['Enchanting']], ["Bring Home the Beacon", False, [], ['Brewing']], ["Bring Home the Beacon", False, [], ['Bottles']], - ["Bring Home the Beacon", False, [], ['Resource Blocks']], ["Bring Home the Beacon", True, [], ['Bucket']], - ["Bring Home the Beacon", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Bring Home the Beacon", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', - 'Enchanting', 'Brewing', 'Bottles', 'Resource Blocks']], + 'Enchanting', 'Brewing', 'Bottles']], ]) def test_42009(self): self.run_location_tests([ ["Not Today, Thank You", False, []], ["Not Today, Thank You", False, [], ["Shield"]], - ["Not Today, Thank You", False, [], ["Ingot Crafting"]], + ["Not Today, Thank You", False, [], ["Progressive Resource Crafting"]], ["Not Today, Thank You", False, [], ["Progressive Tools"]], - ["Not Today, Thank You", True, ["Shield", "Ingot Crafting", "Progressive Tools"]], + ["Not Today, Thank You", True, ["Shield", "Progressive Resource Crafting", "Progressive Tools"]], ]) def test_42010(self): @@ -142,15 +134,15 @@ class TestAdvancements(TestMinecraft): ["Isn't It Iron Pick", False, []], ["Isn't It Iron Pick", True, ["Progressive Tools", "Progressive Tools"], ["Progressive Tools"]], ["Isn't It Iron Pick", False, [], ["Progressive Tools", "Progressive Tools"]], - ["Isn't It Iron Pick", False, [], ["Ingot Crafting"]], - ["Isn't It Iron Pick", False, ["Progressive Tools", "Ingot Crafting"]], - ["Isn't It Iron Pick", True, ["Progressive Tools", "Progressive Tools", "Ingot Crafting"]], + ["Isn't It Iron Pick", False, [], ["Progressive Resource Crafting"]], + ["Isn't It Iron Pick", False, ["Progressive Tools", "Progressive Resource Crafting"]], + ["Isn't It Iron Pick", True, ["Progressive Tools", "Progressive Tools", "Progressive Resource Crafting"]], ]) def test_42011(self): self.run_location_tests([ ["Local Brewery", False, []], - ["Local Brewery", False, [], ['Ingot Crafting']], + ["Local Brewery", False, [], ['Progressive Resource Crafting']], ["Local Brewery", False, [], ['Flint and Steel']], ["Local Brewery", False, [], ['Progressive Tools']], ["Local Brewery", False, [], ['Progressive Weapons']], @@ -158,20 +150,20 @@ class TestAdvancements(TestMinecraft): ["Local Brewery", False, [], ['Brewing']], ["Local Brewery", False, [], ['Bottles']], ["Local Brewery", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Local Brewery", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Local Brewery", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Local Brewery", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], - ["Local Brewery", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Local Brewery", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], ]) def test_42012(self): self.run_location_tests([ ["The Next Generation", False, []], - ["The Next Generation", False, [], ['Ingot Crafting']], + ["The Next Generation", False, [], ['Progressive Resource Crafting']], ["The Next Generation", False, [], ['Flint and Steel']], ["The Next Generation", False, [], ['Progressive Tools']], ["The Next Generation", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], @@ -180,10 +172,10 @@ class TestAdvancements(TestMinecraft): ["The Next Generation", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The Next Generation", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], ["The Next Generation", False, [], ['Archery']], - ["The Next Generation", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["The Next Generation", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The Next Generation", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["The Next Generation", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -198,18 +190,18 @@ class TestAdvancements(TestMinecraft): def test_42014(self): self.run_location_tests([ ["Hot Tourist Destinations", False, []], - ["Hot Tourist Destinations", False, [], ['Ingot Crafting']], + ["Hot Tourist Destinations", False, [], ['Progressive Resource Crafting']], ["Hot Tourist Destinations", False, [], ['Flint and Steel']], ["Hot Tourist Destinations", False, [], ['Progressive Tools']], ["Hot Tourist Destinations", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], - ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], + ["Hot Tourist Destinations", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Hot Tourist Destinations", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42015(self): self.run_location_tests([ ["This Boat Has Legs", False, []], - ["This Boat Has Legs", False, [], ['Ingot Crafting']], + ["This Boat Has Legs", False, [], ['Progressive Resource Crafting']], ["This Boat Has Legs", False, [], ['Flint and Steel']], ["This Boat Has Legs", False, [], ['Progressive Tools']], ["This Boat Has Legs", False, [], ['Progressive Weapons']], @@ -217,10 +209,10 @@ class TestAdvancements(TestMinecraft): ["This Boat Has Legs", False, [], ['Fishing Rod']], ["This Boat Has Legs", False, [], ['Saddle']], ["This Boat Has Legs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["This Boat Has Legs", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Bucket', 'Fishing Rod']], - ["This Boat Has Legs", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']], - ["This Boat Has Legs", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Bucket', 'Fishing Rod']], - ["This Boat Has Legs", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']], + ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Bucket', 'Fishing Rod']], + ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']], + ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Bucket', 'Fishing Rod']], + ["This Boat Has Legs", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']], ]) def test_42016(self): @@ -233,18 +225,18 @@ class TestAdvancements(TestMinecraft): def test_42017(self): self.run_location_tests([ ["Nether", False, []], - ["Nether", False, [], ['Ingot Crafting']], + ["Nether", False, [], ['Progressive Resource Crafting']], ["Nether", False, [], ['Flint and Steel']], ["Nether", False, [], ['Progressive Tools']], ["Nether", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Nether", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], - ["Nether", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], + ["Nether", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Nether", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42018(self): self.run_location_tests([ ["Great View From Up Here", False, []], - ["Great View From Up Here", False, [], ['Ingot Crafting']], + ["Great View From Up Here", False, [], ['Progressive Resource Crafting']], ["Great View From Up Here", False, [], ['Flint and Steel']], ["Great View From Up Here", False, [], ['Progressive Tools']], ["Great View From Up Here", False, [], ['Progressive Weapons']], @@ -252,16 +244,16 @@ class TestAdvancements(TestMinecraft): ["Great View From Up Here", False, [], ['Brewing']], ["Great View From Up Here", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Great View From Up Here", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["Great View From Up Here", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Great View From Up Here", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Great View From Up Here", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Great View From Up Here", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Great View From Up Here", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -269,7 +261,7 @@ class TestAdvancements(TestMinecraft): def test_42019(self): self.run_location_tests([ ["How Did We Get Here?", False, []], - ["How Did We Get Here?", False, [], ['Ingot Crafting']], + ["How Did We Get Here?", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["How Did We Get Here?", False, [], ['Flint and Steel']], ["How Did We Get Here?", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["How Did We Get Here?", False, ['Progressive Weapons', 'Progressive Weapons'], ['Progressive Weapons']], @@ -279,14 +271,13 @@ class TestAdvancements(TestMinecraft): ["How Did We Get Here?", False, [], ['Brewing']], ["How Did We Get Here?", False, [], ['Bottles']], ["How Did We Get Here?", False, [], ['Archery']], - ["How Did We Get Here?", False, [], ['Resource Blocks']], ["How Did We Get Here?", False, [], ['Fishing Rod']], ["How Did We Get Here?", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["How Did We Get Here?", True, ['Ingot Crafting', 'Flint and Steel', + ["How Did We Get Here?", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', 'Shield', - 'Enchanting', 'Brewing', 'Archery', 'Bottles', 'Resource Blocks', 'Fishing Rod', + 'Enchanting', 'Brewing', 'Archery', 'Bottles', 'Fishing Rod', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -294,36 +285,36 @@ class TestAdvancements(TestMinecraft): self.run_location_tests([ ["Bullseye", False, []], ["Bullseye", False, [], ['Archery']], - ["Bullseye", False, [], ['Ingot Crafting']], + ["Bullseye", False, [], ['Progressive Resource Crafting']], ["Bullseye", False, [], ['Progressive Tools']], - ["Bullseye", True, ['Progressive Tools', 'Progressive Tools', 'Ingot Crafting', 'Archery']], + ["Bullseye", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Resource Crafting', 'Archery']], ]) def test_42021(self): self.run_location_tests([ ["Spooky Scary Skeleton", False, []], - ["Spooky Scary Skeleton", False, [], ['Ingot Crafting']], + ["Spooky Scary Skeleton", False, [], ['Progressive Resource Crafting']], ["Spooky Scary Skeleton", False, [], ['Flint and Steel']], ["Spooky Scary Skeleton", False, [], ['Progressive Tools']], ["Spooky Scary Skeleton", False, [], ['Progressive Weapons']], ["Spooky Scary Skeleton", False, [], ['Progressive Armor', 'Shield']], ["Spooky Scary Skeleton", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Spooky Scary Skeleton", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], - ["Spooky Scary Skeleton", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor']], - ["Spooky Scary Skeleton", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], - ["Spooky Scary Skeleton", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], + ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], + ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor']], + ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], + ["Spooky Scary Skeleton", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], ]) def test_42022(self): self.run_location_tests([ ["Two by Two", False, []], - ["Two by Two", False, [], ['Ingot Crafting']], + ["Two by Two", False, [], ['Progressive Resource Crafting']], ["Two by Two", False, [], ['Flint and Steel']], ["Two by Two", False, [], ['Progressive Tools']], ["Two by Two", False, [], ['Progressive Weapons']], ["Two by Two", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Two by Two", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], - ["Two by Two", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], + ["Two by Two", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], + ["Two by Two", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], ]) def test_42023(self): @@ -335,31 +326,31 @@ class TestAdvancements(TestMinecraft): self.run_location_tests([ ["Two Birds, One Arrow", False, []], ["Two Birds, One Arrow", False, [], ['Archery']], - ["Two Birds, One Arrow", False, [], ['Ingot Crafting']], + ["Two Birds, One Arrow", False, [], ['Progressive Resource Crafting']], ["Two Birds, One Arrow", False, ['Progressive Tools'], ['Progressive Tools', 'Progressive Tools']], ["Two Birds, One Arrow", False, [], ['Enchanting']], - ["Two Birds, One Arrow", True, ['Archery', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Enchanting']], + ["Two Birds, One Arrow", True, ['Archery', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Enchanting']], ]) def test_42025(self): self.run_location_tests([ ["We Need to Go Deeper", False, []], - ["We Need to Go Deeper", False, [], ['Ingot Crafting']], + ["We Need to Go Deeper", False, [], ['Progressive Resource Crafting']], ["We Need to Go Deeper", False, [], ['Flint and Steel']], ["We Need to Go Deeper", False, [], ['Progressive Tools']], ["We Need to Go Deeper", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["We Need to Go Deeper", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], - ["We Need to Go Deeper", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], + ["We Need to Go Deeper", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["We Need to Go Deeper", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42026(self): self.run_location_tests([ ["Who's the Pillager Now?", False, []], ["Who's the Pillager Now?", False, [], ['Archery']], - ["Who's the Pillager Now?", False, [], ['Ingot Crafting']], + ["Who's the Pillager Now?", False, [], ['Progressive Resource Crafting']], ["Who's the Pillager Now?", False, [], ['Progressive Tools']], ["Who's the Pillager Now?", False, [], ['Progressive Weapons']], - ["Who's the Pillager Now?", True, ['Archery', 'Progressive Tools', 'Progressive Weapons', 'Ingot Crafting']], + ["Who's the Pillager Now?", True, ['Archery', 'Progressive Tools', 'Progressive Weapons', 'Progressive Resource Crafting']], ]) def test_42027(self): @@ -371,16 +362,16 @@ class TestAdvancements(TestMinecraft): def test_42028(self): self.run_location_tests([ ["Tactical Fishing", False, []], - ["Tactical Fishing", False, [], ['Ingot Crafting']], + ["Tactical Fishing", False, [], ['Progressive Resource Crafting']], ["Tactical Fishing", False, [], ['Progressive Tools']], ["Tactical Fishing", False, [], ['Bucket']], - ["Tactical Fishing", True, ['Ingot Crafting', 'Progressive Tools', 'Bucket']], + ["Tactical Fishing", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Bucket']], ]) def test_42029(self): self.run_location_tests([ ["Zombie Doctor", False, []], - ["Zombie Doctor", False, [], ['Ingot Crafting']], + ["Zombie Doctor", False, [], ['Progressive Resource Crafting']], ["Zombie Doctor", False, [], ['Flint and Steel']], ["Zombie Doctor", False, [], ['Progressive Tools']], ["Zombie Doctor", False, [], ['Progressive Weapons']], @@ -388,20 +379,20 @@ class TestAdvancements(TestMinecraft): ["Zombie Doctor", False, [], ['Brewing']], ["Zombie Doctor", False, [], ['Bottles']], ["Zombie Doctor", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Zombie Doctor", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Zombie Doctor", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Zombie Doctor", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], - ["Zombie Doctor", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Zombie Doctor", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], ]) def test_42030(self): self.run_location_tests([ ["The City at the End of the Game", False, []], - ["The City at the End of the Game", False, [], ['Ingot Crafting']], + ["The City at the End of the Game", False, [], ['Progressive Resource Crafting']], ["The City at the End of the Game", False, [], ['Flint and Steel']], ["The City at the End of the Game", False, [], ['Progressive Tools']], ["The City at the End of the Game", False, [], ['Progressive Weapons']], @@ -409,16 +400,16 @@ class TestAdvancements(TestMinecraft): ["The City at the End of the Game", False, [], ['Brewing']], ["The City at the End of the Game", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The City at the End of the Game", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["The City at the End of the Game", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The City at the End of the Game", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The City at the End of the Game", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The City at the End of the Game", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["The City at the End of the Game", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -427,14 +418,14 @@ class TestAdvancements(TestMinecraft): self.run_location_tests([ ["Ice Bucket Challenge", False, []], ["Ice Bucket Challenge", False, ["Progressive Tools", "Progressive Tools"], ["Progressive Tools"]], - ["Ice Bucket Challenge", False, [], ["Ingot Crafting"]], - ["Ice Bucket Challenge", True, ["Progressive Tools", "Progressive Tools", "Progressive Tools", "Ingot Crafting"]], + ["Ice Bucket Challenge", False, [], ["Progressive Resource Crafting"]], + ["Ice Bucket Challenge", True, ["Progressive Tools", "Progressive Tools", "Progressive Tools", "Progressive Resource Crafting"]], ]) def test_42032(self): self.run_location_tests([ ["Remote Getaway", False, []], - ["Remote Getaway", False, [], ['Ingot Crafting']], + ["Remote Getaway", False, [], ['Progressive Resource Crafting']], ["Remote Getaway", False, [], ['Flint and Steel']], ["Remote Getaway", False, [], ['Progressive Tools']], ["Remote Getaway", False, [], ['Progressive Weapons']], @@ -442,16 +433,16 @@ class TestAdvancements(TestMinecraft): ["Remote Getaway", False, [], ['Brewing']], ["Remote Getaway", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Remote Getaway", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["Remote Getaway", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Remote Getaway", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Remote Getaway", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Remote Getaway", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Remote Getaway", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -459,29 +450,29 @@ class TestAdvancements(TestMinecraft): def test_42033(self): self.run_location_tests([ ["Into Fire", False, []], - ["Into Fire", False, [], ['Ingot Crafting']], + ["Into Fire", False, [], ['Progressive Resource Crafting']], ["Into Fire", False, [], ['Flint and Steel']], ["Into Fire", False, [], ['Progressive Tools']], ["Into Fire", False, [], ['Progressive Weapons']], ["Into Fire", False, [], ['Progressive Armor', 'Shield']], ["Into Fire", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Into Fire", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], - ["Into Fire", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor']], - ["Into Fire", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], - ["Into Fire", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], + ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], + ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor']], + ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], + ["Into Fire", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], ]) def test_42034(self): self.run_location_tests([ ["War Pigs", False, []], - ["War Pigs", False, [], ['Ingot Crafting']], + ["War Pigs", False, [], ['Progressive Resource Crafting']], ["War Pigs", False, [], ['Flint and Steel']], ["War Pigs", False, [], ['Progressive Tools']], ["War Pigs", False, [], ['Progressive Weapons']], ["War Pigs", False, [], ['Progressive Armor', 'Shield']], ["War Pigs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["War Pigs", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], - ["War Pigs", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], + ["War Pigs", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], + ["War Pigs", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield']], ]) def test_42035(self): @@ -496,10 +487,10 @@ class TestAdvancements(TestMinecraft): ["Total Beelocation", False, []], ["Total Beelocation", False, [], ['Enchanting']], ["Total Beelocation", False, [], ['Silk Touch Book']], - ["Total Beelocation", False, [], ['Resource Blocks']], - ["Total Beelocation", False, [], ['Ingot Crafting']], + ["Total Beelocation", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Total Beelocation", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Total Beelocation", True, ['Enchanting', 'Silk Touch Book', 'Resource Blocks', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools']], + ["Total Beelocation", True, ['Enchanting', 'Silk Touch Book', 'Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Progressive Tools', 'Progressive Tools']], ]) def test_42037(self): @@ -507,17 +498,17 @@ class TestAdvancements(TestMinecraft): ["Arbalistic", False, []], ["Arbalistic", False, [], ['Enchanting']], ["Arbalistic", False, [], ['Piercing IV Book']], - ["Arbalistic", False, [], ['Resource Blocks']], - ["Arbalistic", False, [], ['Ingot Crafting']], + ["Arbalistic", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Arbalistic", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["Arbalistic", False, [], ['Archery']], - ["Arbalistic", True, ['Enchanting', 'Piercing IV Book', 'Resource Blocks', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Archery']], + ["Arbalistic", True, ['Enchanting', 'Piercing IV Book', 'Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Archery']], ]) def test_42038(self): self.run_location_tests([ ["The End... Again...", False, []], - ["The End... Again...", False, [], ['Ingot Crafting']], + ["The End... Again...", False, [], ['Progressive Resource Crafting']], ["The End... Again...", False, [], ['Flint and Steel']], ["The End... Again...", False, [], ['Progressive Tools']], ["The End... Again...", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], @@ -526,10 +517,10 @@ class TestAdvancements(TestMinecraft): ["The End... Again...", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The End... Again...", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], ["The End... Again...", False, [], ['Archery']], - ["The End... Again...", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["The End... Again...", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End... Again...", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["The End... Again...", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -538,20 +529,19 @@ class TestAdvancements(TestMinecraft): self.run_location_tests([ ["Acquire Hardware", False, []], ["Acquire Hardware", False, [], ["Progressive Tools"]], - ["Acquire Hardware", False, [], ["Ingot Crafting"]], - ["Acquire Hardware", True, ["Progressive Tools", "Ingot Crafting"]], + ["Acquire Hardware", False, [], ["Progressive Resource Crafting"]], + ["Acquire Hardware", True, ["Progressive Tools", "Progressive Resource Crafting"]], ]) def test_42040(self): self.run_location_tests([ ["Not Quite \"Nine\" Lives", False, []], - ["Not Quite \"Nine\" Lives", False, [], ['Ingot Crafting']], + ["Not Quite \"Nine\" Lives", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Not Quite \"Nine\" Lives", False, [], ['Flint and Steel']], ["Not Quite \"Nine\" Lives", False, [], ['Progressive Tools']], - ["Not Quite \"Nine\" Lives", False, [], ['Resource Blocks']], ["Not Quite \"Nine\" Lives", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Not Quite \"Nine\" Lives", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Resource Blocks']], - ["Not Quite \"Nine\" Lives", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Resource Blocks']], + ["Not Quite \"Nine\" Lives", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Not Quite \"Nine\" Lives", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42041(self): @@ -559,14 +549,14 @@ class TestAdvancements(TestMinecraft): ["Cover Me With Diamonds", False, []], ["Cover Me With Diamonds", False, ['Progressive Armor'], ['Progressive Armor']], ["Cover Me With Diamonds", False, ['Progressive Tools'], ['Progressive Tools', 'Progressive Tools']], - ["Cover Me With Diamonds", False, [], ['Ingot Crafting']], - ["Cover Me With Diamonds", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Armor', 'Progressive Armor']], + ["Cover Me With Diamonds", False, [], ['Progressive Resource Crafting']], + ["Cover Me With Diamonds", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Armor', 'Progressive Armor']], ]) def test_42042(self): self.run_location_tests([ ["Sky's the Limit", False, []], - ["Sky's the Limit", False, [], ['Ingot Crafting']], + ["Sky's the Limit", False, [], ['Progressive Resource Crafting']], ["Sky's the Limit", False, [], ['Flint and Steel']], ["Sky's the Limit", False, [], ['Progressive Tools']], ["Sky's the Limit", False, [], ['Progressive Weapons']], @@ -574,16 +564,16 @@ class TestAdvancements(TestMinecraft): ["Sky's the Limit", False, [], ['Brewing']], ["Sky's the Limit", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Sky's the Limit", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["Sky's the Limit", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Sky's the Limit", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Sky's the Limit", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["Sky's the Limit", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Sky's the Limit", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -591,21 +581,20 @@ class TestAdvancements(TestMinecraft): def test_42043(self): self.run_location_tests([ ["Hired Help", False, []], - ["Hired Help", False, [], ['Resource Blocks']], - ["Hired Help", False, [], ['Ingot Crafting']], + ["Hired Help", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Hired Help", False, [], ['Progressive Tools']], - ["Hired Help", True, ['Progressive Tools', 'Ingot Crafting', 'Resource Blocks']], + ["Hired Help", True, ['Progressive Tools', 'Progressive Resource Crafting', 'Progressive Resource Crafting']], ]) def test_42044(self): self.run_location_tests([ ["Return to Sender", False, []], - ["Return to Sender", False, [], ['Ingot Crafting']], + ["Return to Sender", False, [], ['Progressive Resource Crafting']], ["Return to Sender", False, [], ['Flint and Steel']], ["Return to Sender", False, [], ['Progressive Tools']], ["Return to Sender", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Return to Sender", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], - ["Return to Sender", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], + ["Return to Sender", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], + ["Return to Sender", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']], ]) def test_42045(self): @@ -613,15 +602,15 @@ class TestAdvancements(TestMinecraft): ["Sweet Dreams", False, []], ["Sweet Dreams", True, ['Bed']], ["Sweet Dreams", False, [], ['Bed', 'Progressive Weapons']], - ["Sweet Dreams", False, [], ['Bed', 'Ingot Crafting', 'Campfire']], - ["Sweet Dreams", True, ['Progressive Weapons', 'Ingot Crafting'], ['Bed', 'Campfire']], - ["Sweet Dreams", True, ['Progressive Weapons', 'Campfire'], ['Bed', 'Ingot Crafting']], + ["Sweet Dreams", False, [], ['Bed', 'Progressive Resource Crafting', 'Campfire']], + ["Sweet Dreams", True, ['Progressive Weapons', 'Progressive Resource Crafting'], ['Bed', 'Campfire']], + ["Sweet Dreams", True, ['Progressive Weapons', 'Campfire'], ['Bed', 'Progressive Resource Crafting']], ]) def test_42046(self): self.run_location_tests([ ["You Need a Mint", False, []], - ["You Need a Mint", False, [], ['Ingot Crafting']], + ["You Need a Mint", False, [], ['Progressive Resource Crafting']], ["You Need a Mint", False, [], ['Flint and Steel']], ["You Need a Mint", False, [], ['Progressive Tools']], ["You Need a Mint", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], @@ -631,10 +620,10 @@ class TestAdvancements(TestMinecraft): ["You Need a Mint", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], ["You Need a Mint", False, [], ['Archery']], ["You Need a Mint", False, [], ['Bottles']], - ["You Need a Mint", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["You Need a Mint", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Bottles']], - ["You Need a Mint", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["You Need a Mint", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', 'Bottles']], ]) @@ -647,7 +636,7 @@ class TestAdvancements(TestMinecraft): def test_42048(self): self.run_location_tests([ ["Monsters Hunted", False, []], - ["Monsters Hunted", False, [], ['Ingot Crafting']], + ["Monsters Hunted", False, [], ['Progressive Resource Crafting']], ["Monsters Hunted", False, [], ['Flint and Steel']], ["Monsters Hunted", False, [], ['Progressive Tools']], ["Monsters Hunted", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], @@ -658,7 +647,7 @@ class TestAdvancements(TestMinecraft): ["Monsters Hunted", False, [], ['Archery']], ["Monsters Hunted", False, [], ['Enchanting']], ["Monsters Hunted", False, [], ['Fishing Rod']], - ["Monsters Hunted", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Monsters Hunted", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 'Progressive Armor', 'Enchanting', 'Fishing Rod', 'Brewing', 'Bottles', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], @@ -669,8 +658,8 @@ class TestAdvancements(TestMinecraft): ["Enchanter", False, []], ["Enchanter", False, [], ['Enchanting']], ["Enchanter", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Enchanter", False, [], ['Ingot Crafting']], - ["Enchanter", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Enchanting', 'Ingot Crafting']], + ["Enchanter", False, [], ['Progressive Resource Crafting']], + ["Enchanter", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Enchanting', 'Progressive Resource Crafting']], ]) def test_42050(self): @@ -679,15 +668,15 @@ class TestAdvancements(TestMinecraft): ["Voluntary Exile", False, [], ['Progressive Weapons']], ["Voluntary Exile", False, [], ['Progressive Armor', 'Shield']], ["Voluntary Exile", False, [], ['Progressive Tools']], - ["Voluntary Exile", False, [], ['Ingot Crafting']], - ["Voluntary Exile", True, ['Progressive Tools', 'Progressive Armor', 'Progressive Weapons', 'Ingot Crafting']], - ["Voluntary Exile", True, ['Progressive Tools', 'Shield', 'Progressive Weapons', 'Ingot Crafting']], + ["Voluntary Exile", False, [], ['Progressive Resource Crafting']], + ["Voluntary Exile", True, ['Progressive Tools', 'Progressive Armor', 'Progressive Weapons', 'Progressive Resource Crafting']], + ["Voluntary Exile", True, ['Progressive Tools', 'Shield', 'Progressive Weapons', 'Progressive Resource Crafting']], ]) def test_42051(self): self.run_location_tests([ ["Eye Spy", False, []], - ["Eye Spy", False, [], ['Ingot Crafting']], + ["Eye Spy", False, [], ['Progressive Resource Crafting']], ["Eye Spy", False, [], ['Flint and Steel']], ["Eye Spy", False, [], ['Progressive Tools']], ["Eye Spy", False, [], ['Progressive Weapons']], @@ -695,20 +684,20 @@ class TestAdvancements(TestMinecraft): ["Eye Spy", False, [], ['Brewing']], ["Eye Spy", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["Eye Spy", False, [], ['3 Ender Pearls']], - ["Eye Spy", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls']], - ["Eye Spy", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls']], - ["Eye Spy", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls']], - ["Eye Spy", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Eye Spy", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls']], ]) def test_42052(self): self.run_location_tests([ ["The End", False, []], - ["The End", False, [], ['Ingot Crafting']], + ["The End", False, [], ['Progressive Resource Crafting']], ["The End", False, [], ['Flint and Steel']], ["The End", False, [], ['Progressive Tools']], ["The End", False, [], ['Progressive Weapons']], @@ -716,16 +705,16 @@ class TestAdvancements(TestMinecraft): ["The End", False, [], ['Brewing']], ["The End", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The End", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["The End", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["The End", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -733,7 +722,7 @@ class TestAdvancements(TestMinecraft): def test_42053(self): self.run_location_tests([ ["Serious Dedication", False, []], - ["Serious Dedication", False, [], ['Ingot Crafting']], + ["Serious Dedication", False, [], ['Progressive Resource Crafting']], ["Serious Dedication", False, [], ['Flint and Steel']], ["Serious Dedication", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["Serious Dedication", False, [], ['Progressive Weapons']], @@ -741,9 +730,9 @@ class TestAdvancements(TestMinecraft): ["Serious Dedication", False, [], ['Brewing']], ["Serious Dedication", False, [], ['Bottles']], ["Serious Dedication", False, [], ['Bed']], - ["Serious Dedication", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Serious Dedication", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles', 'Bed']], - ["Serious Dedication", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Serious Dedication", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles', 'Bed']], ]) @@ -753,9 +742,9 @@ class TestAdvancements(TestMinecraft): ["Postmortal", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], ["Postmortal", False, [], ['Progressive Armor']], ["Postmortal", False, [], ['Shield']], - ["Postmortal", False, [], ['Ingot Crafting']], + ["Postmortal", False, [], ['Progressive Resource Crafting']], ["Postmortal", False, [], ['Progressive Tools']], - ["Postmortal", True, ['Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Ingot Crafting', 'Progressive Tools']], + ["Postmortal", True, ['Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Progressive Resource Crafting', 'Progressive Tools']], ]) def test_42055(self): @@ -767,9 +756,9 @@ class TestAdvancements(TestMinecraft): self.run_location_tests([ ["Adventuring Time", False, []], ["Adventuring Time", False, [], ['Progressive Weapons']], - ["Adventuring Time", False, [], ['Campfire', 'Ingot Crafting']], + ["Adventuring Time", False, [], ['Campfire', 'Progressive Resource Crafting']], ["Adventuring Time", True, ['Progressive Weapons', 'Campfire']], - ["Adventuring Time", True, ['Progressive Weapons', 'Ingot Crafting']], + ["Adventuring Time", True, ['Progressive Weapons', 'Progressive Resource Crafting']], ]) def test_42057(self): @@ -780,13 +769,13 @@ class TestAdvancements(TestMinecraft): def test_42058(self): self.run_location_tests([ ["Those Were the Days", False, []], - ["Those Were the Days", False, [], ['Ingot Crafting']], + ["Those Were the Days", False, [], ['Progressive Resource Crafting']], ["Those Were the Days", False, [], ['Flint and Steel']], ["Those Were the Days", False, [], ['Progressive Tools']], ["Those Were the Days", False, [], ['Progressive Weapons']], ["Those Were the Days", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Those Were the Days", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], - ["Those Were the Days", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], + ["Those Were the Days", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], + ["Those Were the Days", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], ]) def test_42059(self): @@ -795,15 +784,15 @@ class TestAdvancements(TestMinecraft): ["Hero of the Village", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], ["Hero of the Village", False, [], ['Progressive Armor']], ["Hero of the Village", False, [], ['Shield']], - ["Hero of the Village", False, [], ['Ingot Crafting']], + ["Hero of the Village", False, [], ['Progressive Resource Crafting']], ["Hero of the Village", False, [], ['Progressive Tools']], - ["Hero of the Village", True, ['Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Ingot Crafting', 'Progressive Tools']], + ["Hero of the Village", True, ['Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Progressive Resource Crafting', 'Progressive Tools']], ]) def test_42060(self): self.run_location_tests([ ["Hidden in the Depths", False, []], - ["Hidden in the Depths", False, [], ['Ingot Crafting']], + ["Hidden in the Depths", False, [], ['Progressive Resource Crafting']], ["Hidden in the Depths", False, [], ['Flint and Steel']], ["Hidden in the Depths", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["Hidden in the Depths", False, [], ['Progressive Weapons']], @@ -811,34 +800,34 @@ class TestAdvancements(TestMinecraft): ["Hidden in the Depths", False, [], ['Brewing']], ["Hidden in the Depths", False, [], ['Bottles']], ["Hidden in the Depths", False, [], ['Bed']], - ["Hidden in the Depths", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Hidden in the Depths", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles', 'Bed']], - ["Hidden in the Depths", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Hidden in the Depths", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles', 'Bed']], ]) def test_42061(self): self.run_location_tests([ ["Beaconator", False, []], - ["Beaconator", False, [], ['Ingot Crafting']], + ["Beaconator", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Beaconator", False, [], ['Flint and Steel']], ["Beaconator", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["Beaconator", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], ["Beaconator", False, ['Progressive Armor'], ['Progressive Armor']], ["Beaconator", False, [], ['Brewing']], ["Beaconator", False, [], ['Bottles']], - ["Beaconator", False, [], ['Resource Blocks']], ["Beaconator", False, [], ['Enchanting']], ["Beaconator", True, [], ['Bucket']], - ["Beaconator", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Beaconator", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', - 'Brewing', 'Bottles', 'Resource Blocks', 'Enchanting']], + 'Brewing', 'Bottles', 'Enchanting']], ]) def test_42062(self): self.run_location_tests([ ["Withering Heights", False, []], - ["Withering Heights", False, [], ['Ingot Crafting']], + ["Withering Heights", False, [], ['Progressive Resource Crafting']], ["Withering Heights", False, [], ['Flint and Steel']], ["Withering Heights", False, [], ['Progressive Tools']], ["Withering Heights", False, ['Progressive Weapons'], ['Progressive Weapons', 'Progressive Weapons']], @@ -847,7 +836,7 @@ class TestAdvancements(TestMinecraft): ["Withering Heights", False, [], ['Brewing']], ["Withering Heights", False, [], ['Bottles']], ["Withering Heights", False, [], ['Enchanting']], - ["Withering Heights", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Withering Heights", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', 'Brewing', 'Bottles', 'Enchanting']], ]) @@ -856,8 +845,7 @@ class TestAdvancements(TestMinecraft): self.run_location_tests([ ["A Balanced Diet", False, []], ["A Balanced Diet", False, [], ['Bottles']], - ["A Balanced Diet", False, [], ['Ingot Crafting']], - ["A Balanced Diet", False, [], ['Resource Blocks']], + ["A Balanced Diet", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["A Balanced Diet", False, [], ['Flint and Steel']], ["A Balanced Diet", False, [], ['Progressive Tools']], ["A Balanced Diet", False, [], ['Progressive Weapons']], @@ -865,27 +853,31 @@ class TestAdvancements(TestMinecraft): ["A Balanced Diet", False, [], ['Brewing']], ["A Balanced Diet", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["A Balanced Diet", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["A Balanced Diet", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Progressive Armor', 'Bottles', 'Resource Blocks', + ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Progressive Armor', 'Bottles', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["A Balanced Diet", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Progressive Armor', 'Bottles', 'Resource Blocks', + ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Progressive Armor', 'Bottles', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["A Balanced Diet", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', - 'Progressive Weapons', 'Shield', 'Bottles', 'Resource Blocks', + ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Bucket', + 'Progressive Weapons', 'Shield', 'Bottles', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["A Balanced Diet", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', - 'Progressive Weapons', 'Shield', 'Bottles', 'Resource Blocks', + ["A Balanced Diet", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', + 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + 'Progressive Weapons', 'Shield', 'Bottles', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) def test_42064(self): self.run_location_tests([ ["Subspace Bubble", False, []], - ["Subspace Bubble", False, [], ['Ingot Crafting']], + ["Subspace Bubble", False, [], ['Progressive Resource Crafting']], ["Subspace Bubble", False, [], ['Flint and Steel']], ["Subspace Bubble", False, [], ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], - ["Subspace Bubble", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Ingot Crafting']], + ["Subspace Bubble", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Progressive Resource Crafting']], ]) def test_42065(self): @@ -896,7 +888,7 @@ class TestAdvancements(TestMinecraft): def test_42066(self): self.run_location_tests([ ["Country Lode, Take Me Home", False, []], - ["Country Lode, Take Me Home", False, [], ['Ingot Crafting']], + ["Country Lode, Take Me Home", False, [], ['Progressive Resource Crafting']], ["Country Lode, Take Me Home", False, [], ['Flint and Steel']], ["Country Lode, Take Me Home", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["Country Lode, Take Me Home", False, [], ['Progressive Weapons']], @@ -904,9 +896,9 @@ class TestAdvancements(TestMinecraft): ["Country Lode, Take Me Home", False, [], ['Brewing']], ["Country Lode, Take Me Home", False, [], ['Bottles']], ["Country Lode, Take Me Home", False, [], ['Bed']], - ["Country Lode, Take Me Home", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Country Lode, Take Me Home", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles', 'Bed']], - ["Country Lode, Take Me Home", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Country Lode, Take Me Home", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles', 'Bed']], ]) @@ -915,27 +907,27 @@ class TestAdvancements(TestMinecraft): ["Bee Our Guest", False, []], ["Bee Our Guest", False, [], ['Campfire']], ["Bee Our Guest", False, [], ['Bottles']], - ["Bee Our Guest", False, [], ['Ingot Crafting']], - ["Bee Our Guest", True, ['Campfire', 'Bottles', 'Ingot Crafting']], + ["Bee Our Guest", False, [], ['Progressive Resource Crafting']], + ["Bee Our Guest", True, ['Campfire', 'Bottles', 'Progressive Resource Crafting']], ]) def test_42068(self): self.run_location_tests([ ["What a Deal!", False, []], ["What a Deal!", False, [], ['Progressive Weapons']], - ["What a Deal!", False, [], ['Campfire', 'Ingot Crafting']], + ["What a Deal!", False, [], ['Campfire', 'Progressive Resource Crafting']], ["What a Deal!", True, ['Progressive Weapons', 'Campfire']], - ["What a Deal!", True, ['Progressive Weapons', 'Ingot Crafting']], + ["What a Deal!", True, ['Progressive Weapons', 'Progressive Resource Crafting']], ]) def test_42069(self): self.run_location_tests([ ["Uneasy Alliance", False, []], - ["Uneasy Alliance", False, [], ['Ingot Crafting']], + ["Uneasy Alliance", False, [], ['Progressive Resource Crafting']], ["Uneasy Alliance", False, [], ['Flint and Steel']], ["Uneasy Alliance", False, [], ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["Uneasy Alliance", False, [], ['Fishing Rod']], - ["Uneasy Alliance", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Ingot Crafting', 'Fishing Rod']], + ["Uneasy Alliance", True, ['Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Progressive Resource Crafting', 'Fishing Rod']], ]) def test_42070(self): @@ -943,21 +935,21 @@ class TestAdvancements(TestMinecraft): ["Diamonds!", False, []], ["Diamonds!", True, ["Progressive Tools", "Progressive Tools"], ["Progressive Tools"]], ["Diamonds!", False, [], ["Progressive Tools", "Progressive Tools"]], - ["Diamonds!", False, [], ["Ingot Crafting"]], - ["Diamonds!", False, ["Progressive Tools", "Ingot Crafting"]], - ["Diamonds!", True, ["Progressive Tools", "Progressive Tools", "Ingot Crafting"]], + ["Diamonds!", False, [], ["Progressive Resource Crafting"]], + ["Diamonds!", False, ["Progressive Tools", "Progressive Resource Crafting"]], + ["Diamonds!", True, ["Progressive Tools", "Progressive Tools", "Progressive Resource Crafting"]], ]) def test_42071(self): self.run_location_tests([ ["A Terrible Fortress", False, []], - ["A Terrible Fortress", False, [], ['Ingot Crafting']], + ["A Terrible Fortress", False, [], ['Progressive Resource Crafting']], ["A Terrible Fortress", False, [], ['Flint and Steel']], ["A Terrible Fortress", False, [], ['Progressive Tools']], ["A Terrible Fortress", False, [], ['Progressive Weapons']], ["A Terrible Fortress", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["A Terrible Fortress", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], - ["A Terrible Fortress", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], + ["A Terrible Fortress", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], + ["A Terrible Fortress", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], ]) def test_42072(self): @@ -974,24 +966,24 @@ class TestAdvancements(TestMinecraft): self.run_location_tests([ ["Sticky Situation", False, []], ["Sticky Situation", False, [], ['Bottles']], - ["Sticky Situation", False, [], ['Ingot Crafting']], + ["Sticky Situation", False, [], ['Progressive Resource Crafting']], ["Sticky Situation", False, [], ['Campfire']], - ["Sticky Situation", True, ['Bottles', 'Ingot Crafting', 'Campfire']], + ["Sticky Situation", True, ['Bottles', 'Progressive Resource Crafting', 'Campfire']], ]) def test_42075(self): self.run_location_tests([ ["Ol' Betsy", False, []], ["Ol' Betsy", False, [], ['Archery']], - ["Ol' Betsy", False, [], ['Ingot Crafting']], + ["Ol' Betsy", False, [], ['Progressive Resource Crafting']], ["Ol' Betsy", False, [], ['Progressive Tools']], - ["Ol' Betsy", True, ['Archery', 'Ingot Crafting', 'Progressive Tools']], + ["Ol' Betsy", True, ['Archery', 'Progressive Resource Crafting', 'Progressive Tools']], ]) def test_42076(self): self.run_location_tests([ ["Cover Me in Debris", False, []], - ["Cover Me in Debris", False, [], ['Ingot Crafting']], + ["Cover Me in Debris", False, [], ['Progressive Resource Crafting']], ["Cover Me in Debris", False, [], ['Flint and Steel']], ["Cover Me in Debris", False, ['Progressive Tools', 'Progressive Tools'], ['Progressive Tools']], ["Cover Me in Debris", False, [], ['Progressive Weapons']], @@ -1000,7 +992,7 @@ class TestAdvancements(TestMinecraft): ["Cover Me in Debris", False, [], ['Bottles']], ["Cover Me in Debris", False, [], ['Bed']], ["Cover Me in Debris", False, ['8 Netherite Scrap'], ['8 Netherite Scrap']], - ["Cover Me in Debris", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Cover Me in Debris", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Progressive Armor', 'Brewing', 'Bottles', 'Bed', '8 Netherite Scrap', '8 Netherite Scrap']], ]) @@ -1008,7 +1000,7 @@ class TestAdvancements(TestMinecraft): def test_42077(self): self.run_location_tests([ ["The End?", False, []], - ["The End?", False, [], ['Ingot Crafting']], + ["The End?", False, [], ['Progressive Resource Crafting']], ["The End?", False, [], ['Flint and Steel']], ["The End?", False, [], ['Progressive Tools']], ["The End?", False, [], ['Progressive Weapons']], @@ -1016,16 +1008,16 @@ class TestAdvancements(TestMinecraft): ["The End?", False, [], ['Brewing']], ["The End?", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ["The End?", False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], - ["The End?", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End?", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End?", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ["The End?", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["The End?", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -1039,9 +1031,9 @@ class TestAdvancements(TestMinecraft): self.run_location_tests([ ["A Complete Catalogue", False, []], ["A Complete Catalogue", False, [], ['Progressive Weapons']], - ["A Complete Catalogue", False, [], ['Campfire', 'Ingot Crafting']], + ["A Complete Catalogue", False, [], ['Campfire', 'Progressive Resource Crafting']], ["A Complete Catalogue", True, ['Progressive Weapons', 'Campfire']], - ["A Complete Catalogue", True, ['Progressive Weapons', 'Ingot Crafting']], + ["A Complete Catalogue", True, ['Progressive Weapons', 'Progressive Resource Crafting']], ]) def test_42080(self): @@ -1057,7 +1049,7 @@ class TestAdvancements(TestMinecraft): def test_42082(self): self.run_location_tests([ ["Hot Topic", False, []], - ["Hot Topic", True, ['Ingot Crafting']], + ["Hot Topic", True, ['Progressive Resource Crafting']], ]) def test_42083(self): @@ -1068,18 +1060,18 @@ class TestAdvancements(TestMinecraft): def test_42084(self): self.run_location_tests([ ["The Lie", False, []], - ["The Lie", False, [], ['Ingot Crafting']], + ["The Lie", False, [], ['Progressive Resource Crafting']], ["The Lie", False, [], ['Bucket']], ["The Lie", False, [], ['Progressive Tools']], - ["The Lie", True, ['Bucket', 'Ingot Crafting', 'Progressive Tools']], + ["The Lie", True, ['Bucket', 'Progressive Resource Crafting', 'Progressive Tools']], ]) def test_42085(self): self.run_location_tests([ ["On a Rail", False, []], - ["On a Rail", False, [], ['Ingot Crafting']], + ["On a Rail", False, [], ['Progressive Resource Crafting']], ["On a Rail", False, ['Progressive Tools'], ['Progressive Tools', 'Progressive Tools']], - ["On a Rail", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Tools']], + ["On a Rail", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools']], ]) def test_42086(self): @@ -1095,7 +1087,7 @@ class TestAdvancements(TestMinecraft): def test_42088(self): self.run_location_tests([ ["When Pigs Fly", False, []], - ["When Pigs Fly", False, [], ['Ingot Crafting']], + ["When Pigs Fly", False, [], ['Progressive Resource Crafting']], ["When Pigs Fly", False, [], ['Progressive Tools']], ["When Pigs Fly", False, [], ['Progressive Weapons']], ["When Pigs Fly", False, [], ['Progressive Armor', 'Shield']], @@ -1103,17 +1095,17 @@ class TestAdvancements(TestMinecraft): ["When Pigs Fly", False, [], ['Saddle']], ["When Pigs Fly", False, ['Progressive Weapons'], ['Flint and Steel', 'Progressive Weapons', 'Progressive Weapons']], ["When Pigs Fly", False, ['Progressive Tools', 'Progressive Tools', 'Progressive Weapons'], ['Bucket', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons']], - ["When Pigs Fly", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']], - ["When Pigs Fly", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']], - ["When Pigs Fly", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Fishing Rod']], - ["When Pigs Fly", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Fishing Rod']], - ["When Pigs Fly", True, ['Saddle', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Ingot Crafting', 'Progressive Tools', 'Fishing Rod']], + ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']], + ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']], + ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Fishing Rod']], + ["When Pigs Fly", True, ['Saddle', 'Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Fishing Rod']], + ["When Pigs Fly", True, ['Saddle', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Progressive Resource Crafting', 'Progressive Tools', 'Fishing Rod']], ]) def test_42089(self): self.run_location_tests([ ["Overkill", False, []], - ["Overkill", False, [], ['Ingot Crafting']], + ["Overkill", False, [], ['Progressive Resource Crafting']], ["Overkill", False, [], ['Flint and Steel']], ["Overkill", False, [], ['Progressive Tools']], ["Overkill", False, [], ['Progressive Weapons']], @@ -1121,13 +1113,13 @@ class TestAdvancements(TestMinecraft): ["Overkill", False, [], ['Brewing']], ["Overkill", False, [], ['Bottles']], ["Overkill", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ["Overkill", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Overkill", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', 'Bottles']], - ["Overkill", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', + ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], - ["Overkill", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', + ["Overkill", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', 'Bottles']], ]) @@ -1140,10 +1132,9 @@ class TestAdvancements(TestMinecraft): def test_42091(self): self.run_location_tests([ ["Overpowered", False, []], - ["Overpowered", False, [], ['Ingot Crafting']], - ["Overpowered", False, [], ['Resource Blocks']], + ["Overpowered", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], ["Overpowered", False, ['Progressive Tools'], ['Flint and Steel', 'Progressive Tools', 'Progressive Tools']], - ["Overpowered", True, ['Resource Blocks', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools']], - ["Overpowered", True, ['Resource Blocks', 'Ingot Crafting', 'Progressive Tools', 'Bucket', 'Flint and Steel']], + ["Overpowered", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools']], + ["Overpowered", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket', 'Flint and Steel']], ]) diff --git a/test/minecraft/TestEntrances.py b/test/minecraft/TestEntrances.py index 65c5f49d..460199fc 100644 --- a/test/minecraft/TestEntrances.py +++ b/test/minecraft/TestEntrances.py @@ -6,31 +6,31 @@ class TestEntrances(TestMinecraft): self.run_entrance_tests([ ['Nether Portal', False, []], ['Nether Portal', False, [], ['Flint and Steel']], - ['Nether Portal', False, [], ['Ingot Crafting']], + ['Nether Portal', False, [], ['Progressive Resource Crafting']], ['Nether Portal', False, [], ['Progressive Tools']], ['Nether Portal', False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], - ['Nether Portal', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Bucket']], - ['Nether Portal', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools']], + ['Nether Portal', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket']], + ['Nether Portal', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools']], ['End Portal', False, []], ['End Portal', False, [], ['Brewing']], ['End Portal', False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], ['End Portal', False, [], ['Flint and Steel']], - ['End Portal', False, [], ['Ingot Crafting']], + ['End Portal', False, [], ['Progressive Resource Crafting']], ['End Portal', False, [], ['Progressive Tools']], ['End Portal', False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ['End Portal', False, [], ['Progressive Weapons']], ['End Portal', False, [], ['Progressive Armor', 'Shield']], - ['End Portal', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Bucket', + ['End Portal', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ['End Portal', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Bucket', + ['End Portal', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ['End Portal', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', + ['End Portal', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ['End Portal', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', + ['End Portal', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], ]) @@ -39,53 +39,53 @@ class TestEntrances(TestMinecraft): self.run_entrance_tests([ # Structures 1 and 2 should be logically equivalent ['Overworld Structure 1', False, []], ['Overworld Structure 1', False, [], ['Progressive Weapons']], - ['Overworld Structure 1', False, [], ['Ingot Crafting', 'Campfire']], - ['Overworld Structure 1', True, ['Progressive Weapons', 'Ingot Crafting']], + ['Overworld Structure 1', False, [], ['Progressive Resource Crafting', 'Campfire']], + ['Overworld Structure 1', True, ['Progressive Weapons', 'Progressive Resource Crafting']], ['Overworld Structure 1', True, ['Progressive Weapons', 'Campfire']], ['Overworld Structure 2', False, []], ['Overworld Structure 2', False, [], ['Progressive Weapons']], - ['Overworld Structure 2', False, [], ['Ingot Crafting', 'Campfire']], - ['Overworld Structure 2', True, ['Progressive Weapons', 'Ingot Crafting']], + ['Overworld Structure 2', False, [], ['Progressive Resource Crafting', 'Campfire']], + ['Overworld Structure 2', True, ['Progressive Weapons', 'Progressive Resource Crafting']], ['Overworld Structure 2', True, ['Progressive Weapons', 'Campfire']], ['Nether Structure 1', False, []], ['Nether Structure 1', False, [], ['Flint and Steel']], - ['Nether Structure 1', False, [], ['Ingot Crafting']], + ['Nether Structure 1', False, [], ['Progressive Resource Crafting']], ['Nether Structure 1', False, [], ['Progressive Tools']], ['Nether Structure 1', False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ['Nether Structure 1', False, [], ['Progressive Weapons']], - ['Nether Structure 1', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Bucket', 'Progressive Weapons']], - ['Nether Structure 1', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], + ['Nether Structure 1', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket', 'Progressive Weapons']], + ['Nether Structure 1', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], ['Nether Structure 2', False, []], ['Nether Structure 2', False, [], ['Flint and Steel']], - ['Nether Structure 2', False, [], ['Ingot Crafting']], + ['Nether Structure 2', False, [], ['Progressive Resource Crafting']], ['Nether Structure 2', False, [], ['Progressive Tools']], ['Nether Structure 2', False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ['Nether Structure 2', False, [], ['Progressive Weapons']], - ['Nether Structure 2', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Bucket', 'Progressive Weapons']], - ['Nether Structure 2', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], + ['Nether Structure 2', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket', 'Progressive Weapons']], + ['Nether Structure 2', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']], ['The End Structure', False, []], ['The End Structure', False, [], ['Brewing']], ['The End Structure', False, ['3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls'], ['3 Ender Pearls']], ['The End Structure', False, [], ['Flint and Steel']], - ['The End Structure', False, [], ['Ingot Crafting']], + ['The End Structure', False, [], ['Progressive Resource Crafting']], ['The End Structure', False, [], ['Progressive Tools']], ['The End Structure', False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], ['The End Structure', False, [], ['Progressive Weapons']], ['The End Structure', False, [], ['Progressive Armor', 'Shield']], - ['The End Structure', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Bucket', + ['The End Structure', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ['The End Structure', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Bucket', + ['The End Structure', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ['The End Structure', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', + ['The End Structure', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], - ['The End Structure', True, ['Flint and Steel', 'Ingot Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', + ['The End Structure', True, ['Flint and Steel', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']],