Changed version definition directory naming

Amulet-Team · Oct 1, 2018 · 4598e34 · 4598e34
1 parent e8b8140
commit 4598e34
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/version_definitions/1_12/blocks.json → ...version_definitions/java_1_12/blocks.json b/src/version_definitions/1_12/blocks.json → ...version_definitions/java_1_12/blocks.json
diff --git a/src/version_definitions/1_12/1_12.py → ...ersion_definitions/java_1_12/java_1_12.py b/src/version_definitions/1_12/1_12.py → ...ersion_definitions/java_1_12/java_1_12.py
@@ -36,4 +36,4 @@ def identify(directory: str) -> bool:
 
 
 def load(directory: str) -> World:
-    return loader["anvil"].LEVEL_CLASS.load(directory, "1_12")
+    return loader["anvil"].LEVEL_CLASS.load(directory, "java_1_12")
diff --git a/src/version_definitions/1_13/blocks.json → ...version_definitions/java_1_13/blocks.json b/src/version_definitions/1_13/blocks.json → ...version_definitions/java_1_13/blocks.json
diff --git a/src/version_definitions/1_13/1_13.py → ...ersion_definitions/java_1_13/java_1_13.py b/src/version_definitions/1_13/1_13.py → ...ersion_definitions/java_1_13/java_1_13.py
@@ -38,4 +38,4 @@ def identify(directory: str) -> bool:
 
 
 def load(directory: str) -> World:
-    return loader["anvil2"].LEVEL_CLASS.load(directory, "1_13")
+    return loader["anvil2"].LEVEL_CLASS.load(directory, "java_1_13")
diff --git a/tests/test_format_proto_1.py b/tests/test_format_proto_1.py
@@ -13,7 +13,7 @@
 
 class TestPrototype112(unittest.TestCase):
     def setUp(self):
-        self.proto = definition_manager.DefinitionManager("1_12")
+        self.proto = definition_manager.DefinitionManager("java_1_12")
 
     def test_direct_access(self):
         self.assertEqual([1, 0], self.proto.blocks["minecraft:stone"])
@@ -49,7 +49,7 @@ def test_get_internal_block(self):
 
 class TestPrototype113(unittest.TestCase):
     def setUp(self):
-        self.proto = definition_manager.DefinitionManager("1_13")
+        self.proto = definition_manager.DefinitionManager("java_1_13")
 
     def test_direct_access(self):
         self.assertEqual("minecraft:stone", self.proto.blocks["minecraft:stone"])

diff --git a/tests/test_loader.py b/tests/test_loader.py
@@ -12,11 +12,11 @@ def setUp(self):
 
     def test_identifing(self):
         name, _format = self.loader.identify(get_world_path("1.12.2 World"))
-        self.assertEqual("1_12", name)
+        self.assertEqual("java_1_12", name)
         self.assertEqual("anvil", _format)
 
         name, _format = self.loader.identify(get_world_path("1.13 World"))
-        self.assertEqual("1_13", name)
+        self.assertEqual("java_1_13", name)
         self.assertEqual("anvil2", _format)
 
     def test_loading(self):