2 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/ActiveCITs.java b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/ActiveCITs.java
index 4d48fdc..8e5faa3 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/ActiveCITs.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/ActiveCITs.java
@@ -24,11 +24,10 @@ public class ActiveCITs implements Disposable { private ActiveCITs() {}
             active.dispose();
             active = null;
         }
-        profiler.pop();
 
         ActiveCITs active = new ActiveCITs();
 
-        profiler.push("citresewn:load_global_properties");
+        profiler.swap("citresewn:load_global_properties");
         PackParser.loadGlobalProperties(resourceManager, active.globalProperties);
         active.globalProperties.callHandlers();
         profiler.pop();
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/GlobalProperties.java b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/GlobalProperties.java
index 7775b66..76f5d26 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/GlobalProperties.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/GlobalProperties.java
@@ -17,7 +17,7 @@ import java.util.Set;
 
 public class GlobalProperties extends PropertyGroup {
     public GlobalProperties() {
-        super(new Identifier("citresewn", "global_properties"));
+        super("global_properties", new Identifier("citresewn", "global_properties"));
     }
 
     @Override
@@ -26,8 +26,8 @@ public class GlobalProperties extends PropertyGroup {
     }
 
     @Override
-    public PropertyGroup load(Identifier identifier, InputStream is) throws IOException, InvalidIdentifierException {
-        PropertyGroup group = PropertyGroup.tryParseGroup(identifier, is);
+    public PropertyGroup load(String packName, Identifier identifier, InputStream is) throws IOException, InvalidIdentifierException {
+        PropertyGroup group = PropertyGroup.tryParseGroup(packName, identifier, is);
         if (group != null)
             for (Map.Entry<PropertyKey, Set<PropertyValue>> entry : group.properties.entrySet())
                 this.properties.computeIfAbsent(entry.getKey(), key -> new LinkedHashSet<>()).addAll(entry.getValue());