From 4d8c7ea53d5f4af351ec9355c55931ad4dad6715 Mon Sep 17 00:00:00 2001
From: SHsuperCM <shsupercm@gmail.com>
Date: Tue, 15 Feb 2022 12:31:42 +0200
Subject: Pass resource manager to type loading

---
 src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java     | 3 ++-
 src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java/shcm/shsupercm')

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 b618dde..7ee1e03 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITType.java
@@ -1,5 +1,6 @@
 package shcm.shsupercm.fabric.citresewn.cit;
 
+import net.minecraft.resource.ResourceManager;
 import shcm.shsupercm.fabric.citresewn.CITResewn;
 import shcm.shsupercm.fabric.citresewn.ex.CITParsingException;
 import shcm.shsupercm.fabric.citresewn.pack.format.PropertyGroup;
@@ -8,7 +9,7 @@ import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
 import java.util.List;
 
 public abstract class CITType {
-    public abstract void load(List<? extends CITCondition> conditions, PropertyGroup properties) throws CITParsingException;
+    public abstract void load(List<? extends 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 1dbc22d..38ca718 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java
@@ -65,7 +65,7 @@ public class PackParser {
             for (Identifier identifier : resourceManager.findResources(root + "/cit", s -> s.endsWith(".properties"))) {
                 String packName = null;
                 try (Resource resource = resourceManager.getResource(identifier)) {
-                    cits.add(parseCIT(PropertyGroup.tryParseGroup(packName = resource.getResourcePackName(), identifier, resource.getInputStream())));
+                    cits.add(parseCIT(PropertyGroup.tryParseGroup(packName = resource.getResourcePackName(), identifier, resource.getInputStream()), resourceManager));
                 } catch (CITParsingException e) {
                     CITResewn.logErrorLoading(e.getMessage());
                 } catch (Exception e) {
@@ -77,7 +77,7 @@ public class PackParser {
         return cits;
     }
 
-    public static CIT<?> parseCIT(PropertyGroup properties) throws CITParsingException {
+    public static CIT<?> parseCIT(PropertyGroup properties, ResourceManager resourceManager) throws CITParsingException {
         CITType citType = CITRegistry.parseType(properties);
 
         ArrayList<CITCondition> conditions = new ArrayList<>();
@@ -109,7 +109,7 @@ public class PackParser {
             return condition == null;
         });
 
-        citType.load(conditions, properties);
+        citType.load(conditions, properties, resourceManager);
 
         return new CIT<>(properties.identifier, properties.packName, citType, conditions.toArray(new CITCondition[0]), weight.weight);
     }
-- 
cgit