Fix saved toolbars not working with non-vanilla items (#5063)

src/main/java/net/minecraftforge/common/ForgeModContainer.java

@@ -572,6 +572,7 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC
         Ingredient.invalidateAll();
         FMLCommonHandler.instance().resetClientRecipeBook();
         FMLCommonHandler.instance().reloadSearchTrees();
+        FMLCommonHandler.instance().reloadCreativeSettings();
     }
 
 

src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java

@@ -1087,6 +1087,12 @@ public class FMLClientHandler implements IFMLSidedHandler
         this.client.getSearchTreeManager().onResourceManagerReload(this.client.getResourceManager());
     }
 
+    @Override
+    public void reloadCreativeSettings()
+    {
+        this.client.creativeSettings.read();
+    }
+
     private CloudRenderer getCloudRenderer()
     {
         if (cloudRenderer == null)

src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java

@@ -777,4 +777,9 @@ public class FMLCommonHandler
     public void reloadSearchTrees() {
         this.sidedDelegate.reloadSearchTrees();
     }
+
+    public void reloadCreativeSettings()
+    {
+        this.sidedDelegate.reloadCreativeSettings();
+    }
 }

src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java

@@ -88,4 +88,6 @@ public interface IFMLSidedHandler
     default void resetClientRecipeBook(){}
 
     default void reloadSearchTrees(){}
+
+    default void reloadCreativeSettings(){}
 }