diff options
author | SHsuperCM <shsupercm@gmail.com> | 2022-02-18 08:31:18 +0200 |
---|---|---|
committer | SHsuperCM <shsupercm@gmail.com> | 2022-02-18 08:31:18 +0200 |
commit | 9a3952f2a17a94ff98494856b1ed9754d7b6ead6 (patch) | |
tree | 3514413d0bb554a371ff11f2f23bb5b8a4a1dc80 /src | |
parent | 75e42832339cc0cfb4584ff45a5d57c335d4618d (diff) | |
download | CITResewn-9a3952f2a17a94ff98494856b1ed9754d7b6ead6.tar.gz CITResewn-9a3952f2a17a94ff98494856b1ed9754d7b6ead6.tar.bz2 CITResewn-9a3952f2a17a94ff98494856b1ed9754d7b6ead6.zip |
Fixed ambiguous conditions list for type loading
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java | 2 | ||||
-rw-r--r-- | src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java | 2 |
2 files changed, 2 insertions, 2 deletions
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(); |