From e65743a55f2812412e7e8673e5095f6c47a7b597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Schr=C3=B6der?=
<fschroeder@techfak.uni-bielefeld.de>
Date: Thu, 29 Feb 2024 18:07:53 +0100
Subject: [PATCH] Rename module 'game_items' to 'items'
The module 'game_items' was renamed to 'items'. Every reference to this module across different source code files was consequently updated to reflect this change.
---
cooperative_cuisine/counter_factory.py | 4 ++--
cooperative_cuisine/counters.py | 2 +-
cooperative_cuisine/effects.py | 4 ++--
cooperative_cuisine/environment.py | 8 ++++----
cooperative_cuisine/{game_items.py => items.py} | 0
cooperative_cuisine/orders.py | 2 +-
cooperative_cuisine/player.py | 2 +-
cooperative_cuisine/recipes.py | 2 +-
cooperative_cuisine/reinforcement_learning/gym_env.py | 2 +-
tests/test_cooking_equipment.py | 2 +-
tests/test_counter.py | 2 +-
tests/test_item.py | 2 +-
tests/test_start.py | 2 +-
13 files changed, 17 insertions(+), 17 deletions(-)
rename cooperative_cuisine/{game_items.py => items.py} (100%)
diff --git a/cooperative_cuisine/counter_factory.py b/cooperative_cuisine/counter_factory.py
index cf426238..592def76 100644
--- a/cooperative_cuisine/counter_factory.py
+++ b/cooperative_cuisine/counter_factory.py
@@ -52,14 +52,14 @@ from cooperative_cuisine.counters import (
Trashcan,
)
from cooperative_cuisine.effects import EffectManager
-from cooperative_cuisine.game_items import (
+from cooperative_cuisine.hooks import Hooks
+from cooperative_cuisine.items import (
ItemInfo,
ItemType,
CookingEquipment,
Plate,
Item,
)
-from cooperative_cuisine.hooks import Hooks
from cooperative_cuisine.orders import OrderManager
from cooperative_cuisine.utils import get_closest
diff --git a/cooperative_cuisine/counters.py b/cooperative_cuisine/counters.py
index c72c9aea..04ee69c6 100644
--- a/cooperative_cuisine/counters.py
+++ b/cooperative_cuisine/counters.py
@@ -72,7 +72,7 @@ if TYPE_CHECKING:
import numpy as np
import numpy.typing as npt
-from cooperative_cuisine.game_items import (
+from cooperative_cuisine.items import (
Item,
CookingEquipment,
Plate,
diff --git a/cooperative_cuisine/effects.py b/cooperative_cuisine/effects.py
index ceef2794..0e5d3ec6 100644
--- a/cooperative_cuisine/effects.py
+++ b/cooperative_cuisine/effects.py
@@ -12,14 +12,14 @@ from datetime import timedelta, datetime
from random import Random
from typing import TYPE_CHECKING, Tuple
-from cooperative_cuisine.game_items import (
+from cooperative_cuisine.hooks import Hooks, NEW_FIRE, FIRE_SPREADING
+from cooperative_cuisine.items import (
ItemInfo,
Item,
ItemType,
CookingEquipment,
Effect,
)
-from cooperative_cuisine.hooks import Hooks, NEW_FIRE, FIRE_SPREADING
from cooperative_cuisine.utils import get_touching_counters, find_item_on_counters
if TYPE_CHECKING:
diff --git a/cooperative_cuisine/environment.py b/cooperative_cuisine/environment.py
index e5d1c89d..c94d68c0 100644
--- a/cooperative_cuisine/environment.py
+++ b/cooperative_cuisine/environment.py
@@ -22,10 +22,6 @@ from cooperative_cuisine.counters import (
PlateConfig,
)
from cooperative_cuisine.effects import EffectManager
-from cooperative_cuisine.game_items import (
- ItemInfo,
- ItemType,
-)
from cooperative_cuisine.hooks import (
ITEM_INFO_LOADED,
LAYOUT_FILE_PARSED,
@@ -46,6 +42,10 @@ from cooperative_cuisine.hooks import (
ITEM_INFO_CONFIG,
POST_STEP,
)
+from cooperative_cuisine.items import (
+ ItemInfo,
+ ItemType,
+)
from cooperative_cuisine.movement import Movement
from cooperative_cuisine.orders import (
OrderManager,
diff --git a/cooperative_cuisine/game_items.py b/cooperative_cuisine/items.py
similarity index 100%
rename from cooperative_cuisine/game_items.py
rename to cooperative_cuisine/items.py
diff --git a/cooperative_cuisine/orders.py b/cooperative_cuisine/orders.py
index e1e082e1..000493e4 100644
--- a/cooperative_cuisine/orders.py
+++ b/cooperative_cuisine/orders.py
@@ -44,7 +44,6 @@ from datetime import datetime, timedelta
from random import Random
from typing import Callable, Tuple, Any, Deque, TypedDict, Type
-from cooperative_cuisine.game_items import Item, Plate, ItemInfo
from cooperative_cuisine.hooks import (
Hooks,
SERVE_NOT_ORDERED_MEAL,
@@ -55,6 +54,7 @@ from cooperative_cuisine.hooks import (
ORDER_DURATION_SAMPLE,
ORDER_EXPIRED,
)
+from cooperative_cuisine.items import Item, Plate, ItemInfo
log = logging.getLogger(__name__)
"""The logger for this module."""
diff --git a/cooperative_cuisine/player.py b/cooperative_cuisine/player.py
index 82ed1ede..f4e69c3a 100644
--- a/cooperative_cuisine/player.py
+++ b/cooperative_cuisine/player.py
@@ -16,7 +16,7 @@ import numpy as np
import numpy.typing as npt
from cooperative_cuisine.counters import Counter
-from cooperative_cuisine.game_items import Item, ItemType
+from cooperative_cuisine.items import Item, ItemType
from cooperative_cuisine.state_representation import PlayerState
log = logging.getLogger(__name__)
diff --git a/cooperative_cuisine/recipes.py b/cooperative_cuisine/recipes.py
index 91b3947c..dbd5d1c3 100644
--- a/cooperative_cuisine/recipes.py
+++ b/cooperative_cuisine/recipes.py
@@ -6,7 +6,7 @@ import networkx as nx
from networkx import DiGraph
from cooperative_cuisine import ROOT_DIR
-from cooperative_cuisine.game_items import ItemInfo
+from cooperative_cuisine.items import ItemInfo
class MealGraphDict(TypedDict):
diff --git a/cooperative_cuisine/reinforcement_learning/gym_env.py b/cooperative_cuisine/reinforcement_learning/gym_env.py
index 6b138cd9..465701fe 100644
--- a/cooperative_cuisine/reinforcement_learning/gym_env.py
+++ b/cooperative_cuisine/reinforcement_learning/gym_env.py
@@ -26,7 +26,7 @@ from cooperative_cuisine.counters import Counter, CookingCounter, Dispenser
from cooperative_cuisine.environment import (
Environment,
)
-from cooperative_cuisine.game_items import CookingEquipment
+from cooperative_cuisine.items import CookingEquipment
from cooperative_cuisine.pygame_2d_vis.drawing import Visualizer
diff --git a/tests/test_cooking_equipment.py b/tests/test_cooking_equipment.py
index 5bc9fa3b..03f936f1 100644
--- a/tests/test_cooking_equipment.py
+++ b/tests/test_cooking_equipment.py
@@ -1,6 +1,6 @@
import pytest
-from cooperative_cuisine.game_items import ItemInfo, CookingEquipment, Item, ItemType
+from cooperative_cuisine.items import ItemInfo, CookingEquipment, Item, ItemType
def test_can_combine_single_other_item():
diff --git a/tests/test_counter.py b/tests/test_counter.py
index b0fb93a9..d6860acb 100644
--- a/tests/test_counter.py
+++ b/tests/test_counter.py
@@ -1,8 +1,8 @@
import numpy as np
from cooperative_cuisine.counters import ServingWindow, Dispenser
-from cooperative_cuisine.game_items import Item, Plate, ItemInfo, ItemType
from cooperative_cuisine.hooks import Hooks
+from cooperative_cuisine.items import Item, Plate, ItemInfo, ItemType
from cooperative_cuisine.utils import create_init_env_time
diff --git a/tests/test_item.py b/tests/test_item.py
index 9b3cdb64..5a72924d 100644
--- a/tests/test_item.py
+++ b/tests/test_item.py
@@ -1,6 +1,6 @@
import pytest
-from cooperative_cuisine.game_items import ItemInfo, Item, ItemType
+from cooperative_cuisine.items import ItemInfo, Item, ItemType
@pytest.fixture
diff --git a/tests/test_start.py b/tests/test_start.py
index d52e19db..b3dce650 100644
--- a/tests/test_start.py
+++ b/tests/test_start.py
@@ -9,9 +9,9 @@ from cooperative_cuisine.counters import Counter, CuttingBoard
from cooperative_cuisine.environment import (
Environment,
)
-from cooperative_cuisine.game_items import Item, ItemInfo, ItemType
from cooperative_cuisine.game_server import PlayerRequestType
from cooperative_cuisine.hooks import Hooks
+from cooperative_cuisine.items import Item, ItemInfo, ItemType
from cooperative_cuisine.server_results import (
PlayerInfo,
CreateEnvResult,
--
GitLab