From 9a3952f2a17a94ff98494856b1ed9754d7b6ead6 Mon Sep 17 00:00:00 2001
From: SHsuperCM <shsupercm@gmail.com>
Date: Fri, 18 Feb 2022 08:31:18 +0200
Subject: Fixed ambiguous conditions list for type loading

---
 .../shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeArmor.java   | 2 +-
 .../shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeElytra.java  | 2 +-
 .../shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java  | 2 +-
 .../shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeItem.java    | 2 +-
 src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java          | 2 +-
 src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeArmor.java b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeArmor.java
index 2b857fa..9f0beed 100644
--- a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeArmor.java
+++ b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeArmor.java
@@ -23,7 +23,7 @@ public class TypeArmor extends CITType {
     }
 
     @Override
-    public void load(List<? extends CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
+    public void load(List<CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
 
     }
 
diff --git a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeElytra.java b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeElytra.java
index f0f7540..1b5367b 100644
--- a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeElytra.java
+++ b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeElytra.java
@@ -23,7 +23,7 @@ public class TypeElytra extends CITType {
     }
 
     @Override
-    public void load(List<? extends CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
+    public void load(List<CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
 
     }
 
diff --git a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java
index 3a340b1..566273a 100644
--- a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java
+++ b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java
@@ -35,7 +35,7 @@ public class TypeEnchantment extends CITType {
     }
 
     @Override
-    public void load(List<? extends CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
+    public void load(List<CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
 
     }
 
diff --git a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeItem.java b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeItem.java
index 9cb623e..02a2bf1 100644
--- a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeItem.java
+++ b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeItem.java
@@ -62,7 +62,7 @@ public class TypeItem extends CITType {
     }
 
     @Override
-    public void load(List<? extends CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
+    public void load(List<CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
         for (CITCondition condition : conditions)
             if (condition instanceof ConditionItems conditionItems)
                 items.addAll(Arrays.asList(conditionItems.items));
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java
index aed784a..468c1cb 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java
@@ -13,7 +13,7 @@ import java.util.*;
 public abstract class CITType {
     public abstract Set<PropertyKey> typeProperties();
 
-    public abstract void load(List<? extends CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException;
+    public abstract void load(List<CITCondition> conditions, PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException;
 
     protected void warn(String message, PropertyValue value, PropertyGroup properties) {
         CITResewn.logWarnLoading("Warning: " + CITParsingException.descriptionOf(message, properties, value.position()));
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
index 4c5b116..163435b 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
@@ -80,7 +80,7 @@ public class PackParser {
     public static CIT<?> parseCIT(PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
         CITType citType = CITRegistry.parseType(properties);
 
-        ArrayList<CITCondition> conditions = new ArrayList<>();
+        List<CITCondition> conditions = new ArrayList<>();
 
         Set<PropertyKey> ignoredProperties = citType.typeProperties();
 
-- 
cgit