Merge pull request #4 from ItzSkyReed/dev/0.4.3

Dev/0.4.3

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "BACAP_Parser"
-version = "0.4.2"
+version = "0.4.3"
 description = "Library to parse BlazeAndCavesAdvancementsPack and Addons for it"
 readme = "README.md"
 license = {file = "LICENSE"}

src/BACAP_Parser/Criteria.py

@@ -2,14 +2,16 @@
 
 
 class Criteria:
-    def __init__(self, name: str, trigger: str):
+    def __init__(self, name: str, trigger: str, conditions: dict | None = None):
         """
         Class of the advancement criteria.
         :param name: Name of the criteria.
-        :param trigger: trigger of the criteria.
+        :param trigger: Trigger of the criteria.
+        :param conditions: Conditions of the criteria as raw dict object.
         """
         self._name = name
         self._trigger = cut_namespace(trigger)
+        self._conditions = conditions
         self._is_impossible = None
 
     @property
@@ -26,16 +28,20 @@ def trigger(self) -> str:
         """
         return self._trigger
 
+    @property
+    def conditions(self) -> dict | None:
+        return self._conditions
+
     def __repr__(self):
         return f"<Criteria name={self._name}, trigger={self._trigger}"
 
     def __str__(self):
         return f"<Criteria name={self._name}, trigger={self._trigger}"
 
     def __eq__(self, other: "Criteria") -> bool:
-        if other.__class__ != self.__class__:
+        if not isinstance(other, Criteria):
             raise TypeError("Element must be an instance of the Criteria class")
-        return (self._name == other._name) and (self._trigger == other._trigger)
+        return (self._name == other._name) and (self._trigger == other._trigger) and (self._conditions == other._conditions)
 
     def __ne__(self, other: "Criteria") -> bool:
         return not self.__eq__(other)

src/BACAP_Parser/CriteriaList.py

@@ -18,7 +18,7 @@ def __init__(self, adv_criteria: Union[dict, Criteria, list, "CriteriaList", Non
 
         elif isinstance(adv_criteria, dict):
             for name, crit in adv_criteria.items():
-                criteria = Criteria(name, crit["trigger"])
+                criteria = Criteria(name, crit["trigger"], conditions=crit.get("conditions"))
                 self.append(criteria)
 
         elif isinstance(adv_criteria, Criteria):
@@ -86,6 +86,8 @@ def remove(self, criteria: Criteria | str, **kwargs):
                     self.remove(criteria)
 
     def __eq__(self, other: "CriteriaList") -> bool:
+        if not isinstance(other, CriteriaList):
+            return NotImplemented
         return super().__eq__(other)
 
     def __contains__(self, criteria: Criteria) -> bool: