3 files changed, 24 insertions, 2 deletions
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/api/Disposable.java b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITDisposable.java
index 85b8849..240f197 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/api/Disposable.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITDisposable.java
@@ -1,7 +1,7 @@
 package shcm.shsupercm.fabric.citresewn.api;
 
 @FunctionalInterface
-public interface Disposable {
+public interface CITDisposable {
     String ENTRYPOINT = "citresewn:dispose";
 
     void dispose();
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/api/GlobalPropertiesHandler.java b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java
index ac8228a..ada5147 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/api/GlobalPropertiesHandler.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java
@@ -3,7 +3,7 @@ package shcm.shsupercm.fabric.citresewn.api;
 import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
 
 @FunctionalInterface
-public interface GlobalPropertiesHandler {
+public interface CITGlobalProperties {
     String ENTRYPOINT = "citresewn:global_property";
 
     void globalProperty(String key, PropertyValue value) throws Exception;
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITTypeContainer.java b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITTypeContainer.java
new file mode 100644
index 0000000..d691ab2
--- /dev/null
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITTypeContainer.java
@@ -0,0 +1,22 @@
+package shcm.shsupercm.fabric.citresewn.api;
+
+import shcm.shsupercm.fabric.citresewn.pack.cit.CIT;
+import shcm.shsupercm.fabric.citresewn.pack.cit.CITType;
+
+import java.util.Collection;
+import java.util.function.Supplier;
+
+public abstract class CITTypeContainer<T extends CITType> implements CITDisposable {
+    public static final String ENTRYPOINT = "citresewn:type";
+    public final Class<T> type;
+    public final Supplier<T> createType;
+    public final String id;
+
+    public CITTypeContainer(Class<T> type, Supplier<T> createType, String id) {
+        this.type = type;
+        this.createType = createType;
+        this.id = id;
+    }
+
+    public abstract void load(Collection<CIT> parsedCITs);
+}