diff --git a/gradle.properties b/gradle.properties
index 1a2582329..f3832bff7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ artifact_basename=appliedenergistics2
 minecraft_release=1.16
 minecraft_version=1.16.1
 mcp_mappings=20200723-1.16.1
-forge_version=32.0.75
+forge_version=32.0.93
 
 #########################################################
 # Provided APIs                                         #
diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java
index 783b0df34..61ef6edd4 100644
--- a/src/main/java/appeng/core/Registration.java
+++ b/src/main/java/appeng/core/Registration.java
@@ -18,6 +18,7 @@
 
 package appeng.core;
 
+import appeng.spatial.StorageChunkGenerator;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -31,6 +32,7 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.particles.ParticleType;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.GenerationStage;
@@ -49,6 +51,7 @@ import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.extensions.IForgeContainerType;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -694,6 +697,8 @@ final class Registration {
         StructureAccessor.register(MeteoriteStructure.ID.toString(),
                 MeteoriteStructure.INSTANCE.setRegistryName(MeteoriteStructure.ID),
                 GenerationStage.Decoration.TOP_LAYER_MODIFICATION);
+
+        Registry.register(Registry.CHUNK_GENERATOR_CODEC, AppEng.makeId("storage"), StorageChunkGenerator.CODEC);
     }
 
     public void registerBiomes(RegistryEvent.Register<Biome> evt) {
@@ -732,7 +737,7 @@ final class Registration {
 
         modEventBus.addListener(this::registerParticleFactories);
         modEventBus.addListener(this::registerTextures);
-        modEventBus.addListener(this::modelRegistryEvent);
+        MinecraftForge.EVENT_BUS.addListener(this::modelRegistryEvent);
         modEventBus.addListener(this::registerItemColors);
         modEventBus.addListener(this::handleModelBake);
     }