aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/shcm/shsupercm/fabric/citresewn/pack
diff options
context:
space:
mode:
authorSHsuperCM <shsupercm@gmail.com>2022-02-13 11:01:45 +0200
committerSHsuperCM <shsupercm@gmail.com>2022-02-13 11:01:45 +0200
commitfe02178b220ebf57225bd092bfdb0d8b88067c33 (patch)
tree181746d9bdc746df55edc75558236fef13085b3d /src/main/java/shcm/shsupercm/fabric/citresewn/pack
parent49318a4452f629274e96001700006e0b4a1464a5 (diff)
downloadCITResewn-fe02178b220ebf57225bd092bfdb0d8b88067c33.tar.gz
CITResewn-fe02178b220ebf57225bd092bfdb0d8b88067c33.tar.bz2
CITResewn-fe02178b220ebf57225bd092bfdb0d8b88067c33.zip
Generified CITs to their type
Diffstat (limited to 'src/main/java/shcm/shsupercm/fabric/citresewn/pack')
-rw-r--r--src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java8
1 files changed, 4 insertions, 4 deletions
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 35e8c87..7555866 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
@@ -57,8 +57,8 @@ public class PackParser {
});
}
- public static List<CIT> loadCITs(ResourceManager resourceManager) {
- List<CIT> cits = new ArrayList<>();
+ public static List<CIT<?>> loadCITs(ResourceManager resourceManager) {
+ List<CIT<?>> cits = new ArrayList<>();
for (String root : ROOTS)
for (Identifier identifier : resourceManager.findResources(root + "/cit", s -> s.endsWith(".properties"))) {
@@ -75,7 +75,7 @@ public class PackParser {
}
- public static CIT parseCIT(PropertyGroup properties) throws CITParsingException {
+ public static CIT<?> parseCIT(PropertyGroup properties) throws CITParsingException {
CITType citType = CITRegistry.parseType(properties);
ArrayList<CITCondition> conditions = new ArrayList<>();
@@ -108,6 +108,6 @@ public class PackParser {
citType.load(conditions, properties);
- return new CIT(properties.identifier, properties.packName, citType, conditions.toArray(new CITCondition[0]), weight.weight);
+ return new CIT<>(properties.identifier, properties.packName, citType, conditions.toArray(new CITCondition[0]), weight.weight);
}
}