diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java
index 9e1e95ee4..9f9786b07 100644
--- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java
+++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java
@@ -13,13 +13,11 @@ import com.dfsek.terra.api.world.biome.TerraBiome;
 import java.util.function.Supplier;
 
 public class BiomeConfigType implements ConfigType<BiomeTemplate, TerraBiome> {
-    private final ConfigPack pack;
     private final BiomeFactory factory;
 
     public static final TypeKey<TerraBiome> BIOME_TYPE_TOKEN = new TypeKey<>() {};
 
     public BiomeConfigType(ConfigPack pack) {
-        this.pack = pack;
         this.factory = new BiomeFactory(pack);
     }
 
@@ -40,7 +38,7 @@ public class BiomeConfigType implements ConfigType<BiomeTemplate, TerraBiome> {
 
     @Override
     public Supplier<OpenRegistry<TerraBiome>> registrySupplier(ConfigPack pack) {
-        return () -> this.pack.getRegistryFactory().create(registry -> (TypeLoader<TerraBiome>) (t, c, loader) -> {
+        return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<TerraBiome>) (t, c, loader) -> {
             if(c.equals("SELF")) return null;
             TerraBiome obj = registry.get((String) c);
             if(obj == null)
diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java
index 6dd284243..101a6aa90 100644
--- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java
+++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java
@@ -25,7 +25,7 @@ public class FloraAddon extends TerraAddon implements EventListener {
     }
 
     public void onPackLoad(ConfigPackPreLoadEvent event) throws DuplicateEntryException {
-        event.getPack().registerConfigType(new FloraConfigType(event.getPack()), "FLORA", 2);
+        event.getPack().registerConfigType(new FloraConfigType(), "FLORA", 2);
         event.getPack().applyLoader(BlockLayer.class, BlockLayerTemplate::new);
     }
 }
diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java
index d8d34164b..1fc80a9b4 100644
--- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java
+++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java
@@ -12,14 +12,9 @@ import java.util.function.Supplier;
 
 public class FloraConfigType implements ConfigType<FloraTemplate, Flora> {
     private final FloraFactory factory = new FloraFactory();
-    private final ConfigPack pack;
 
     public static final TypeKey<Flora> FLORA_TYPE_TOKEN = new TypeKey<>(){};
 
-    public FloraConfigType(ConfigPack pack) {
-        this.pack = pack;
-    }
-
     @Override
     public FloraTemplate getTemplate(ConfigPack pack, TerraPlugin main) {
         return new FloraTemplate();
@@ -37,6 +32,6 @@ public class FloraConfigType implements ConfigType<FloraTemplate, Flora> {
 
     @Override
     public Supplier<OpenRegistry<Flora>> registrySupplier(ConfigPack pack) {
-        return this.pack.getRegistryFactory()::create;
+        return pack.getRegistryFactory()::create;
     }
 }
diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java
index 3ad6c7474..16ec7e418 100644
--- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java
+++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java
@@ -25,7 +25,7 @@ public class OreAddon extends TerraAddon implements EventListener {
     }
 
     public void onPackLoad(ConfigPackPreLoadEvent event) throws DuplicateEntryException {
-        event.getPack().registerConfigType(new OreConfigType(event.getPack()), "ORE", 1);
+        event.getPack().registerConfigType(new OreConfigType(), "ORE", 1);
         event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("ORE", pack -> new OrePopulator(main));
     }
 }
diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java
index cd17b4212..e284b41d3 100644
--- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java
+++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java
@@ -12,13 +12,8 @@ import java.util.function.Supplier;
 
 public class OreConfigType implements ConfigType<OreTemplate, Ore> {
     private final OreFactory factory = new OreFactory();
-    private final ConfigPack pack;
     public static final TypeKey<Ore> ORE_TYPE_TOKEN = new TypeKey<>(){};
 
-    public OreConfigType(ConfigPack pack) {
-        this.pack = pack;
-    }
-
     @Override
     public OreTemplate getTemplate(ConfigPack pack, TerraPlugin main) {
         return new OreTemplate();
@@ -36,6 +31,6 @@ public class OreConfigType implements ConfigType<OreTemplate, Ore> {
 
     @Override
     public Supplier<OpenRegistry<Ore>> registrySupplier(ConfigPack pack) {
-        return this.pack.getRegistryFactory()::create;
+        return pack.getRegistryFactory()::create;
     }
 }
diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java
index 5e3e2bb5c..45817a62b 100644
--- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java
+++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java
@@ -24,7 +24,7 @@ public class PaletteAddon extends TerraAddon implements EventListener {
     }
 
     public void onPackLoad(ConfigPackPreLoadEvent event) {
-        event.getPack().registerConfigType(new PaletteConfigType(event.getPack(), main), "PALETTE", 2);
+        event.getPack().registerConfigType(new PaletteConfigType(main), "PALETTE", 2);
         event.getPack().applyLoader(PaletteLayerHolder.class, new PaletteLayerLoader());
     }
 }
diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java
index 0455910de..2a3c821be 100644
--- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java
+++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java
@@ -15,13 +15,11 @@ import java.util.function.Supplier;
 
 public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {
     private final PaletteFactory factory = new PaletteFactory();
-    private final ConfigPack pack;
     private final TerraPlugin main;
 
     public static final TypeKey<Palette> PALETTE_TYPE_TOKEN = new TypeKey<>(){};
 
-    public PaletteConfigType(ConfigPack pack, TerraPlugin main) {
-        this.pack = pack;
+    public PaletteConfigType(TerraPlugin main) {
         this.main = main;
     }
 
@@ -42,7 +40,7 @@ public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {
 
     @Override
     public Supplier<OpenRegistry<Palette>> registrySupplier(ConfigPack pack) {
-        return () -> this.pack.getRegistryFactory().create(registry -> (TypeLoader<Palette>) (t, c, loader) -> {
+        return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<Palette>) (t, c, loader) -> {
             if(((String) c).startsWith("BLOCK:"))
                 return new PaletteImpl.Singleton(main.getWorldHandle().createBlockData(((String) c).substring(6))); // Return single palette for BLOCK: shortcut.
             Palette obj = registry.get((String) c);
diff --git a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeAddon.java b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeAddon.java
index 2f9020275..053f07cfc 100644
--- a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeAddon.java
+++ b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeAddon.java
@@ -23,6 +23,6 @@ public class TreeAddon extends TerraAddon implements EventListener {
     }
 
     public void onPackLoad(ConfigPackPreLoadEvent event) throws DuplicateEntryException {
-        event.getPack().registerConfigType(new TreeConfigType(event.getPack()), "TREE", 2);
+        event.getPack().registerConfigType(new TreeConfigType(), "TREE", 2);
     }
 }
diff --git a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeConfigType.java b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeConfigType.java
index 85a79f88f..179463470 100644
--- a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeConfigType.java
+++ b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeConfigType.java
@@ -12,12 +12,8 @@ import java.util.function.Supplier;
 
 public class TreeConfigType implements ConfigType<TreeTemplate, Tree> {
     private final TreeFactory factory = new TreeFactory();
-    private final ConfigPack pack;
 
     public static final TypeKey<Tree> TREE_TYPE_TOKEN = new TypeKey<>(){};
-    public TreeConfigType(ConfigPack pack) {
-        this.pack = pack;
-    }
 
     @Override
     public TreeTemplate getTemplate(ConfigPack pack, TerraPlugin main) {
@@ -36,6 +32,6 @@ public class TreeConfigType implements ConfigType<TreeTemplate, Tree> {
 
     @Override
     public Supplier<OpenRegistry<Tree>> registrySupplier(ConfigPack pack) {
-        return this.pack.getRegistryFactory()::create;
+        return pack.getRegistryFactory()::create;
     }
 }
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
index 15d66e5ca..37883b349 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
@@ -191,7 +191,7 @@ public class ConfigPackImpl implements ConfigPack {
     @SuppressWarnings("unchecked")
     private ConfigTypeRegistry createRegistry() {
         return new ConfigTypeRegistry(main, (id, configType) -> {
-            OpenRegistry<?> openRegistry = configType.registrySupplier().get();
+            OpenRegistry<?> openRegistry = configType.registrySupplier(this).get();
             if(registryMap.containsKey(configType.getTypeClass().getType())) { // Someone already registered something; we need to copy things to the new registry.
                 registryMap.get(configType.getTypeClass().getType()).getLeft().forEach(((OpenRegistry<Object>) openRegistry)::register);
             }