aboutsummaryrefslogtreecommitdiff
path: root/defaults/src/main
diff options
context:
space:
mode:
authorSHsuperCM <shsupercm@gmail.com>2022-02-18 08:31:18 +0200
committerSHsuperCM <shsupercm@gmail.com>2022-02-18 08:31:18 +0200
commit9a3952f2a17a94ff98494856b1ed9754d7b6ead6 (patch)
tree3514413d0bb554a371ff11f2f23bb5b8a4a1dc80 /defaults/src/main
parent75e42832339cc0cfb4584ff45a5d57c335d4618d (diff)
downloadCITResewn-9a3952f2a17a94ff98494856b1ed9754d7b6ead6.tar.gz
CITResewn-9a3952f2a17a94ff98494856b1ed9754d7b6ead6.tar.bz2
CITResewn-9a3952f2a17a94ff98494856b1ed9754d7b6ead6.zip
Fixed ambiguous conditions list for type loading
Diffstat (limited to 'defaults/src/main')
-rw-r--r--defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeArmor.java2
-rw-r--r--defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeElytra.java2
-rw-r--r--defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java2
-rw-r--r--defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeItem.java2
4 files changed, 4 insertions, 4 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));