diff --git a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
index 1c05c97..3dce73a 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
@@ -1,7 +1,9 @@
 package dev.micle.firefly_bush_backport.proxy;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
+import dev.micle.firefly_bush_backport.block.ModBlocks;
 import dev.micle.firefly_bush_backport.config.Config;
+import dev.micle.firefly_bush_backport.item.ModItems;
 import net.minecraft.client.Minecraft;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.player.Player;
@@ -20,10 +22,13 @@ public class Proxy implements IProxy {
 
     // Common setup
     public Proxy() {
+        IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
+
         Config.register();
+        ModBlocks.register(modEventBus);
+        ModItems.register(modEventBus);
 
         // Register mod event bus listeners
-        IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
         modEventBus.addListener(Proxy::setup);
         modEventBus.addListener(Proxy::imcEnqueue);
         modEventBus.addListener(Proxy::imcProcess);