From 2dd500edf5978cff513e2aa5c638276f7e2963cb Mon Sep 17 00:00:00 2001
From: Andy Zhang <37402126+AnzhiZhang@users.noreply.github.com>
Date: Fri, 2 Dec 2022 14:04:06 +0000
Subject: [PATCH] =?UTF-8?q?fix(gamemode):=20=F0=9F=90=9B=20fix=20load=5Fco?=
 =?UTF-8?q?nfig=5Fsimple=20as=20MCDR=20api=20changed=20(fix=20#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamemode/gamemode/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gamemode/gamemode/__init__.py b/gamemode/gamemode/__init__.py
index 334d839..8864bbe 100644
--- a/gamemode/gamemode/__init__.py
+++ b/gamemode/gamemode/__init__.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 import time
 from math import ceil, floor
+from typing import Optional, Any
 
 from mcdreforged.api.types import PluginServerInterface, PlayerCommandSource
 from mcdreforged.api.command import *
 from mcdreforged.api.decorator import new_thread
 from mcdreforged.api.utils import Serializable
 
-import minecraft_data_api
-
 DIMENSIONS = {
     '0': 'minecraft:overworld',
     '-1': 'minecraft:the_nether',
@@ -51,6 +50,7 @@ class Config(Serializable):
 
 config: Config
 data: dict
+minecraft_data_api: Optional[Any]
 
 
 def nether_to_overworld(x, z):
@@ -62,13 +62,14 @@ def overworld_to_nether(x, z):
 
 
 def on_load(server: PluginServerInterface, old):
-    global data
+    global data, minecraft_data_api
     permissions = server.load_config_simple(
         'config.json',
         default_config=DEFAULT_CONFIG,
         target_class=Config
     )
-    data = server.load_config_simple('data.json', default_config={})
+    data = server.load_config_simple('data.json')
+    minecraft_data_api = server.get_plugin_instance('minecraft_data_api')
 
     server.register_help_message('!!spec help', 'Gamemode插件帮助')