mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
Stardew valley: Fix package and imports for apworld linux (#1842)
- Fix csv load to use explicitly imported self package instead of keyword __package__ - Fix init.py having a relative import to outside of the apworld
This commit is contained in:
@@ -10,7 +10,7 @@ from .logic import StardewLogic, StardewRule, True_
|
|||||||
from .options import stardew_valley_options, StardewOptions, fetch_options
|
from .options import stardew_valley_options, StardewOptions, fetch_options
|
||||||
from .regions import create_regions
|
from .regions import create_regions
|
||||||
from .rules import set_rules
|
from .rules import set_rules
|
||||||
from ..generic.Rules import set_rule
|
from worlds.generic.Rules import set_rule
|
||||||
|
|
||||||
client_version = 0
|
client_version = 0
|
||||||
|
|
||||||
|
@@ -1,6 +1,8 @@
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
|
from .. import data
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
@dataclass(frozen=True)
|
||||||
class SeedItem:
|
class SeedItem:
|
||||||
@@ -23,7 +25,7 @@ def load_crop_csv():
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
from importlib_resources import files # noqa
|
from importlib_resources import files # noqa
|
||||||
|
|
||||||
with files(__package__).joinpath("crops.csv").open() as file:
|
with files(data).joinpath("crops.csv").open() as file:
|
||||||
reader = csv.DictReader(file)
|
reader = csv.DictReader(file)
|
||||||
crops = []
|
crops = []
|
||||||
seeds = []
|
seeds = []
|
||||||
|
Reference in New Issue
Block a user