From 57f2b3b662baa6d2518542bf4ea63bac86b052d7 Mon Sep 17 00:00:00 2001
From: virus-rpi <72336443+virus-rpi@users.noreply.github.com>
Date: Thu, 29 May 2025 14:31:39 +0200
Subject: [PATCH 1/4] .

---
 minecraft_data/data | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 minecraft_data/data

diff --git a/minecraft_data/data b/minecraft_data/data
deleted file mode 160000
index 7b784ac..0000000
--- a/minecraft_data/data
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7b784ac5e983a23f9570b485cdcf854d48517eb6

From 494429e5ac2d62b036f0da0b63e510726e7985e5 Mon Sep 17 00:00:00 2001
From: virus-rpi <72336443+virus-rpi@users.noreply.github.com>
Date: Thu, 29 May 2025 14:35:01 +0200
Subject: [PATCH 2/4] .

---
 .gitmodules | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 01331f5..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "minecraft_data/data"]
-	path = minecraft_data/data
-	url = git@github.com:PrismarineJS/minecraft-data.git

From 88b7f79c2bda37ed75af8c0b2c51e5871a8c8552 Mon Sep 17 00:00:00 2001
From: virus-rpi <72336443+virus-rpi@users.noreply.github.com>
Date: Thu, 29 May 2025 14:36:35 +0200
Subject: [PATCH 3/4] Add minecraft_data submodule for data management

---
 .gitmodules         | 3 +++
 minecraft_data/data | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 minecraft_data/data

diff --git a/.gitmodules b/.gitmodules
index e69de29..01331f5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "minecraft_data/data"]
+	path = minecraft_data/data
+	url = git@github.com:PrismarineJS/minecraft-data.git
diff --git a/minecraft_data/data b/minecraft_data/data
new file mode 160000
index 0000000..99303b4
--- /dev/null
+++ b/minecraft_data/data
@@ -0,0 +1 @@
+Subproject commit 99303b46b32a8d866c6a8f9c0348bf6019073be1

From 0e37acc8018c169e09cb2e05b2fa9aebeb8e988b Mon Sep 17 00:00:00 2001
From: virus-rpi <72336443+virus-rpi@users.noreply.github.com>
Date: Thu, 29 May 2025 14:42:43 +0200
Subject: [PATCH 4/4] fix: read files correctly chore: update example.py to use
 newer versions

---
 example.py              | 4 ++--
 minecraft_data/tools.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/example.py b/example.py
index 8295a77..366ddff 100644
--- a/example.py
+++ b/example.py
@@ -1,6 +1,6 @@
 import minecraft_data
 # Java edition minecraft-data
-mcd = minecraft_data("1.13")
+mcd = minecraft_data("1.21.3")
 
 print(mcd.version)
 
@@ -14,7 +14,7 @@
 print(mcd.effects_name['Haste'])
 
 # Bedrock Edition minecraft-data
-mcd_pe = minecraft_data("1.0", "bedrock")
+mcd_pe = minecraft_data("1.21.70", "bedrock")
 
 print(mcd_pe.version)
 print(mcd_pe.find_item_or_block('stone'))
diff --git a/minecraft_data/tools.py b/minecraft_data/tools.py
index eb4ffcd..0fd6b37 100644
--- a/minecraft_data/tools.py
+++ b/minecraft_data/tools.py
@@ -4,7 +4,7 @@
 
 
 def convert(_dir, version, edition ='pc'):
-    with open(os.path.join(_dir, 'dataPaths.json')) as f:
+    with open(os.path.join(_dir, 'dataPaths.json'), encoding="utf-8") as f:
         datapaths = json.load(f)
     data = _grabdata(_dir, datapaths[edition][version])
     ret = {}
@@ -49,7 +49,7 @@ def commondata(_dir, edition = 'pc'):
     common_path = os.path.join(_dir, edition, 'common')
     for common_file in os.listdir(common_path):
         key = common_file.split('.', 1)[0]
-        with open(os.path.join(common_path, common_file)) as f:
+        with open(os.path.join(common_path, common_file), encoding="utf-8") as f:
             data = json.load(f)
             ret.update({key: data})
     return ret
@@ -60,7 +60,7 @@ def _grabdata(_dir, datapaths):
     for category, folder in datapaths.items():
         path = os.path.join(_dir, folder, f'{category}.json')
         if os.path.isfile(path):
-            with open(path) as fp:
+            with open(path, encoding="utf-8") as fp:
                 data[category] = json.load(fp)
     return data